From c026701bd4f9dcbaf4ca539f0f645e8d57728ef4 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 29 Apr 2016 09:38:49 +0200 Subject: [PATCH] fix compile warnings --- arangod/VocBase/MasterPointer.h | 4 ++-- arangod/Wal/Marker.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arangod/VocBase/MasterPointer.h b/arangod/VocBase/MasterPointer.h index 2ab939ba97..feed265f00 100644 --- a/arangod/VocBase/MasterPointer.h +++ b/arangod/VocBase/MasterPointer.h @@ -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(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(arangodb::DatafileHelper::VPackOffset(TRI_DF_MARKER_VPACK_DOCUMENT) + vpackSize()); } inline uint32_t alignedMarkerSize() const { diff --git a/arangod/Wal/Marker.h b/arangod/Wal/Marker.h index 1f563e2c88..1f343c552e 100644 --- a/arangod/Wal/Marker.h +++ b/arangod/Wal/Marker.h @@ -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(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(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(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(DatafileHelper::VPackOffset(_type)); } /// @brief store the marker in the memory region starting at mem