From cea5f9def6d6b9e78dec05da46c8faf149ccf09a Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Thu, 27 Oct 2016 10:33:34 +0200 Subject: [PATCH] try to fix some windows warnings --- arangod/GeneralServer/VppNetwork.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arangod/GeneralServer/VppNetwork.h b/arangod/GeneralServer/VppNetwork.h index becf81cbbf..2e64f0a212 100644 --- a/arangod/GeneralServer/VppNetwork.h +++ b/arangod/GeneralServer/VppNetwork.h @@ -88,7 +88,8 @@ inline std::unique_ptr createChunkForNetworkDetail( } // calculate length of current chunk - uint32_t chunkLength = dataLength + chunkHeaderLength(firstOfMany); + uint32_t chunkLength = + dataLength + static_cast(chunkHeaderLength(firstOfMany)); auto buffer = std::make_unique(TRI_UNKNOWN_MEM_ZONE, chunkLength, false); @@ -155,10 +156,11 @@ inline std::unique_ptr createChunkForNetworkDetail( chunk |= isFirstChunk ? 0x1 : 0x0; // get the lenght of VPack data - uint32_t dataLength = end - begin; + uint32_t dataLength = static_cast(end - begin); // calculate length of current chunk - uint32_t chunkLength = dataLength + chunkHeaderLength(firstOfMany); + uint32_t chunkLength = + dataLength + static_cast(chunkHeaderLength(firstOfMany)); auto buffer = std::make_unique(TRI_UNKNOWN_MEM_ZONE, chunkLength, false); @@ -197,13 +199,13 @@ inline void send_many( uint64_t id, std::size_t maxChunkBytes, std::unique_ptr completeMessage, std::size_t uncompressedCompleteMessageLength) { - std::size_t totalLen = completeMessage->length(); + uint64_t totalLen = completeMessage->length(); std::size_t offsetBegin = 0; std::size_t offsetEnd = maxChunkBytes - chunkHeaderLength(true); // maximum number of bytes for follow up chunks std::size_t maxBytes = maxChunkBytes - chunkHeaderLength(false); - std::size_t numberOfChunks = 1; + uint32_t numberOfChunks = 1; { // calcuate the number of chunks taht will be send std::size_t bytesToSend = totalLen - maxChunkBytes + chunkHeaderLength(true); // data for first chunk @@ -221,7 +223,7 @@ inline void send_many( createChunkForNetworkMultiFirst(completeMessage->c_str(), offsetBegin, offsetEnd, id, numberOfChunks, totalLen)); - std::size_t chunkNumber = 0; + std::uint32_t chunkNumber = 0; while (offsetEnd + maxBytes <= totalLen) { // send middle offsetBegin = offsetEnd; @@ -294,8 +296,7 @@ inline std::vector> createChunkForNetwork( // fill buffer for (auto const& slice : slices) { - vppPayload->appendText( - slice.startAs(), slice.byteSize()); + vppPayload->appendText(slice.startAs(), slice.byteSize()); } if (compress) {