fixed some truncations

arangodb · Nov 25, 2015 · 67eaf11 · 67eaf11
1 parent d5e3ced
commit 67eaf11
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/velocypack/velocypack-common.h b/include/velocypack/velocypack-common.h
@@ -27,7 +27,6 @@
 #ifndef VELOCYPACK_COMMON_H
 #define VELOCYPACK_COMMON_H 1
 
-#include <cstddef>
 #include <cstdint>
 
 // debug mode

diff --git a/src/Builder.cpp b/src/Builder.cpp
@@ -118,18 +118,19 @@ void Builder::sortObjectIndexLong(uint8_t* objBase,
   entries.clear();
 #endif
 
-  entries.reserve(offsets.size());
-  for (ValueLength i = 0; i < offsets.size(); i++) {
+  size_t const n = offsets.size();
+  entries.reserve(n);
+  for (size_t i = 0; i < n; i++) {
     SortEntry e;
     e.offset = offsets[i];
     e.nameStart = findAttrName(objBase + e.offset, e.nameSize, options);
     entries.push_back(e);
   }
-  VELOCYPACK_ASSERT(entries.size() == offsets.size());
+  VELOCYPACK_ASSERT(entries.size() == n);
   doActualSort(entries);
 
   // copy back the sorted offsets
-  for (ValueLength i = 0; i < offsets.size(); i++) {
+  for (size_t i = 0; i < n; i++) {
     offsets[i] = entries[i].offset;
   }
 }

diff --git a/tools/json-to-vpack.cpp b/tools/json-to-vpack.cpp
@@ -179,7 +179,7 @@ int main(int argc, char* argv[]) {
     std::unordered_map<std::string, size_t> keysFound;
     buildCompressedKeys(s, keysFound);
 
-    std::vector<std::tuple<size_t, std::string, size_t>> stats;
+    std::vector<std::tuple<uint64_t, std::string, size_t>> stats;
     size_t requiredLength = 2;
     uint64_t nextId = 0;
     for (auto const& it : keysFound) {