Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Michael Hackstein 2016-04-29 10:28:27 +02:00
parent bc519d8626 c026701bd4
commit 8c12c1cc9d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/VocBase/MasterPointer.h
View File

@ -112,7 +112,7 @@ struct TRI_doc_mptr_t {
// return the size of the stored VPack
inline uint32_t vpackSize() const {
return VPackSlice(vpack()).byteSize();
return static_cast<uint32_t>(VPackSlice(vpack()).byteSize());
}
// return a pointer to the beginning of the Vpack
@ -122,7 +122,7 @@ struct TRI_doc_mptr_t {
// return the size of the marker
inline uint32_t markerSize() const {
return arangodb::DatafileHelper::VPackOffset(TRI_DF_MARKER_VPACK_DOCUMENT) + vpackSize();
return static_cast<uint32_t>(arangodb::DatafileHelper::VPackOffset(TRI_DF_MARKER_VPACK_DOCUMENT) + vpackSize());
}
inline uint32_t alignedMarkerSize() const {

8
arangod/Wal/Marker.h
View File

@ -144,7 +144,7 @@ class CrudMarker : public Marker {
/// @brief returns the marker size
uint32_t size() const override final {
return DatafileHelper::VPackOffset(_type) + _data.byteSize();
return static_cast<uint32_t>(DatafileHelper::VPackOffset(_type) + _data.byteSize());
}
/// @brief store the marker in the memory region starting at mem
@ -188,7 +188,7 @@ class DatabaseMarker : public Marker {
/// @brief returns the marker size
uint32_t size() const override final {
return DatafileHelper::VPackOffset(_type) + _data.byteSize();
return static_cast<uint32_t>(DatafileHelper::VPackOffset(_type) + _data.byteSize());
}
/// @brief store the marker in the memory region starting at mem
@ -233,7 +233,7 @@ class CollectionMarker : public Marker {
/// @brief returns the marker size
uint32_t size() const override final {
return DatafileHelper::VPackOffset(_type) + _data.byteSize();
return static_cast<uint32_t>(DatafileHelper::VPackOffset(_type) + _data.byteSize());
}
/// @brief store the marker in the memory region starting at mem
@ -279,7 +279,7 @@ class TransactionMarker : public Marker {
/// @brief returns the marker size
uint32_t size() const override final {
// these markers do not have any VPack payload
return DatafileHelper::VPackOffset(_type);
return static_cast<uint32_t>(DatafileHelper::VPackOffset(_type));
}
/// @brief store the marker in the memory region starting at mem