8000 Bug fix/fix msvc2019 build by Dronplane · Pull Request #11052 · arangodb/arangodb · GitHub
[go: up one dir, main page]

Skip to content

Bug fix/fix msvc2019 build #11052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Mar 31, 2020
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c35a353
Fix build
Dronplane Feb 3, 2020
aa2c6c1
Update VERSIONS
KVS85 Feb 3, 2020
ffc5c75
Fixed debug build&run
Dronplane Feb 6, 2020
57bd6b1
Merge branch 'bug-fix/fix-msvc2019-build' of https://github.com/arang…
Dronplane Feb 6, 2020
9f873be
Updated sort from upstream
Dronplane Feb 7, 2020
7fe80af
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
KVS85 Feb 8, 2020
4fb0c0c
Merge branch 'devel' of github.com:arangodb/ArangoDB into bug-fix/fix…
dothebart Feb 10, 2020
1274096
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/fix…
goedderz Feb 11, 2020
8996828
Work around MSVC STL bug
goedderz Feb 11, 2020
7693875
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
KVS85 Feb 11, 2020
8273a79
Merge branch 'devel' of github.com:arangodb/ArangoDB into bug-fix/fix…
dothebart Feb 11, 2020
8e9b3d6
Try to use debug hack for release
Dronplane Feb 21, 2020
48aab35
Merge branch 'devel' into bug-fix/fix-msvc2019-build
Dronplane Feb 21, 2020
42be0f4
set to msvc2017
Dronplane Feb 21, 2020
912df2e
Merge branch 'devel' into bug-fix/fix-msvc2019-build
Dronplane Feb 21, 2020
357feea
Merge branch 'devel' into bug-fix/fix-msvc2019-build
Dronplane Mar 2, 2020
4b2c81a
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
KVS85 Mar 18, 2020
fceff53
Remove MSVC workaroud
KVS85 Mar 18, 2020
84115aa
Enable MSVS 2019 usage
KVS85 Mar 18, 2020
7c87529
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
KVS85 Mar 30, 2020
fb75804
Fixed MSVC2019 warning
Dronplane Mar 31, 2020
e0ef65a
Better fix for GraphStore
Dronplane Mar 31, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove MSVC workaroud
  • Loading branch information
KVS85 committed Mar 18, 2020
commit fceff5380a80809be94a52d97a9d8604ba894ba3
10 changes: 1 addition & 9 deletions arangod/Aql/AqlItemMatrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,7 @@ ShadowAqlItemRow AqlItemMatrix::popShadowRow() {
_size = blockPtr->size() - lastSize - 1;
}
// Remove all but the last block
auto const first = _blocks.begin();
auto const last = _blocks.end() - 1;
// This check should be unnecessary, but is here to work around the bug
// https://developercommunity.visualstudio.com/content/problem/776568/vc-move-assigns-the-vector-to-itself-if-erase-is-c.html
// where vector::erase of the STL in MSVC 2019 calls self-move-assignments on
// every element from first to end() in the vector, if first == last.
if (first != last) {
_blocks.erase(first, last);
}
_blocks.erase(_blocks.begin(), _blocks.end() - 1);
TRI_ASSERT(_blocks.size() == 1);
return shadowRow;
}
Expand Down
0