10000 Bug fix/fix msvc2019 build (#11052) · arangodb/arangodb@a80f336 · GitHub
[go: up one dir, main page]

Skip to content

Commit a80f336

Browse files
DronplaneKVS85dothebartgoedderz
authored
Bug fix/fix msvc2019 build (#11052)
* Fix build * Update VERSIONS * Fixed debug build&run * Updated sort from upstream * Work around MSVC STL bug * Try to use debug hack for release * set to msvc2017 * Remove MSVC workaroud * Enable MSVS 2019 usage * Fixed MSVC2019 warning * Better fix for GraphStore Co-authored-by: KVS85 <vadim@arangodb.com> Co-authored-by: Wilfried Goesgens <willi@arangodb.com> Co-authored-by: Tobias Gödderz <tobias@arangodb.com>
1 parent dcaad6e commit a80f336

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

3rdParty/V8/v7.9.317/src/codegen/source-position.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,23 +146,23 @@ class SourcePosition final {
146146

147147
// The two below are only used if IsExternal() is true.
148148
using ExternalLineField = BitField64<int, 1, 20>;
149-
#ifdef DEBUG
149+
//#ifdef DEBUG
150150
// looks like debug build uses more external files
151151
// so extend bits for this field, but play safe for release builds
152152
using ExternalFileIdField = BitField64<int, 21, 16>;
153-
#else
154-
using ExternalFileIdField = BitField64<int, 21, 10>;
155-
#endif
153+
//#else
154+
// using ExternalFileIdField = BitField64<int, 21, 10>;
155+
//#endif
156156
// ScriptOffsetField is only used if IsExternal() is false.
157157
using ScriptOffsetField = BitField64<int, 1, 30>;
158158

159159
// InliningId is in the high bits for better compression in
160160
// SourcePositionTable.
161-
#ifdef DEBUG // also shift this field for above change for ExternalFileIdField
161+
//#ifdef DEBUG // also shift this field for above change for ExternalFileIdField
162162
using InliningIdField = BitField64<int, 37, 16>;
163-
#else
164-
using InliningIdField = BitField64<int, 31, 16>;
165-
#endif
163+
//#else
164+
// using InliningIdField = BitField64<int, 31, 16>;
165+
//#endif
166166
// Leaving the highest bit untouched to allow for signed conversion.
167167
uint64_t value_;
168168
};

VERSIONS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CXX_STANDARD "17"
22
STARTER_REV "0.14.14"
33
SYNCER_REV "0.7.3"
44
GCC_LINUX "9.2.0"
5-
MSVC_WINDOWS "2017"
5+
MSVC_WINDOWS "2019"
66
MACOS_MIN "10.14"
77
OPENSSL_LINUX "1.1.1d"
88
OPENSSL_MACOS "1.1.1d"

arangod/Aql/AqlItemMatrix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ ShadowAqlItemRow AqlItemMatrix::popShadowRow() {
151151
TRI_ASSERT(blockPtr->size() >= _startIndexInFirstBlock);
152152
_size = blockPtr->size() - _startIndexInFirstBlock;
153153
}
154-
// Remove all but the last
154+
// Remove all but the last block
155155
_blocks.erase(_blocks.begin(), _blocks.end() - 1);
156156
TRI_ASSERT(_blocks.size() == 1);
157157
return shadowRow;

arangod/Pregel/GraphStore.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ class GraphStore final {
9898
void _storeVertices(std::vector<ShardID> const& globalShards,
9999
RangeIterator<Vertex<V,E>>& it);
100100

101-
size_t vertexSegmentSize () const {
102-
return std::ceil<size_t>( 64 * 1024 * 1024 / sizeof(Vertex<V,E>));
101+
constexpr size_t vertexSegmentSize () const {
102+
return 64 * 1024 * 1024 / sizeof(Vertex<V,E>);
103103
}
104-
size_t edgeSegmentSize() const {
105-
return std::ceil<size_t>( 64 * 1024 * 1024 / sizeof(Edge<E>));
104+
constexpr size_t edgeSegmentSize() const {
105+
return 64 * 1024 * 1024 / sizeof(Edge<E>);
106106
}
107107

108108
private:

0 commit comments

Comments
 (0)
0