arangodb · KVS85 · Mar 31, 2020 · Feb 3, 2020 · Feb 3, 2020 · Feb 6, 2020
diff --git a/3rdParty/V8/v7.9.317/src/codegen/source-position.h b/3rdParty/V8/v7.9.317/src/codegen/source-position.h
@@ -146,23 +146,23 @@ class SourcePosition final {
 
   // The two below are only used if IsExternal() is true.
   using ExternalLineField = BitField64<int, 1, 20>;
-#ifdef DEBUG
+//#ifdef DEBUG
 // looks like debug build uses more external files
 // so extend bits for this field, but play safe for release builds 
   using ExternalFileIdField = BitField64<int, 21, 16>;
-#else
-  using ExternalFileIdField = BitField64<int, 21, 10>;
-#endif
+//#else
+//  using ExternalFileIdField = BitField64<int, 21, 10>;
+//#endif
   // ScriptOffsetField is only used if IsExternal() is false.
   using ScriptOffsetField = BitField64<int, 1, 30>;
 
   // InliningId is in the high bits for better compression in
   // SourcePositionTable.
-#ifdef DEBUG // also shift this field for above change  for ExternalFileIdField
+//#ifdef DEBUG // also shift this field for above change  for ExternalFileIdField
   using InliningIdField = BitField64<int, 37, 16>;
-#else
-  using InliningIdField = BitField64<int, 31, 16>;
-#endif
+//#else
+//  using InliningIdField = BitField64<int, 31, 16>;
+//#endif
   // Leaving the highest bit untouched to allow for signed conversion.
   uint64_t value_;
 };

diff --git a/VERSIONS b/VERSIONS
@@ -2,7 +2,7 @@ CXX_STANDARD "17"
 STARTER_REV "0.14.14"
 SYNCER_REV "0.7.3"
 GCC_LINUX "9.2.0"
-MSVC_WINDOWS "2017"
+MSVC_WINDOWS "2019"
 MACOS_MIN "10.14"
 OPENSSL_LINUX   "1.1.1d"
 OPENSSL_MACOS   "1.1.1d"

diff --git a/arangod/Aql/AqlItemMatrix.cpp b/arangod/Aql/AqlItemMatrix.cpp
@@ -151,7 +151,7 @@ ShadowAqlItemRow AqlItemMatrix::popShadowRow() {
     TRI_ASSERT(blockPtr->size() >= _startIndexInFirstBlock);
     _size = blockPtr->size() - _startIndexInFirstBlock;
   }
-  // Remove all but the last
+  // Remove all but the last block
   _blocks.erase(_blocks.begin(), _blocks.end() - 1);
   TRI_ASSERT(_blocks.size() == 1);
   return shadowRow;

diff --git a/arangod/Pregel/GraphStore.h b/arangod/Pregel/GraphStore.h
@@ -98,11 +98,11 @@ class GraphStore final {
   void _storeVertices(std::vector<ShardID> const& globalShards,
                       RangeIterator<Vertex<V,E>>& it);
 
-  size_t vertexSegmentSize () const {
-    return std::ceil<size_t>( 64 * 1024 * 1024 / sizeof(Vertex<V,E>));
+  constexpr size_t vertexSegmentSize () const {
+    return 64 * 1024 * 1024 / sizeof(Vertex<V,E>);
   }
-  size_t edgeSegmentSize() const {
-    return std::ceil<size_t>( 64 * 1024 * 1024 / sizeof(Edge<E>));
+  constexpr size_t edgeSegmentSize() const {
+    return 64 * 1024 * 1024 / sizeof(Edge<E>);
   }
 
  private: