8000 fix windows debug build by dothebart · Pull Request #10465 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

fix windows debug build #10465

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.

Sign up for GitHub

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

8000
Merged
merged 1 commit into from
Nov 19, 2019
Merged

fix windows debug build #10465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions arangod/Aql/UnsortedGatherExecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ class UnsortedGatherExecutor {

private:
Fetcher& _fetcher;

::arangodb::containers::SmallVector<ExecutionState>::allocator_type::arena_type _arena;
::arangodb::containers::SmallVector<ExecutionState> _upstream{_arena};
// 64: default size of buffer; 8: Alignment size; computed to 4 but breaks in windows debug build.
::arangodb::containers::SmallVector<ExecutionState, 64, 8>::allocator_type::arena_type _arena;
::arangodb::containers::SmallVector<ExecutionState, 64, 8> _upstream{_arena};

// Total Number of dependencies
size_t _numberDependencies;
Expand Down
5 changes: 2 additions & 3 deletions lib/Basics/win-utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
/// @author Dr. Oreste Costa-Panaia
////////////////////////////////////////////////////////////////////////////////

#include "Basics/Common.h"

#include <WinSock2.h> // must be before windows.h
#include <shellapi.h>
#include <windows.h>


#include <errno.h>
#include <fcntl.h>
#include <io.h>
Expand All @@ -47,9 +46,9 @@
#include <crtdbg.h>
#include <malloc.h>
#include <string.h>
#include <windows.h>

#include "Basics/Common.h"

#include "Basics/ScopeGuard.h"
#include "Basics/StringUtils.h"
#include "Basics/Utf8Helper.h"
Expand Down
4 changes: 2 additions & 2 deletions lib/Containers/SmallVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
namespace arangodb {
namespace containers {

template <class T, std::size_t BufSize = 64>
using SmallVector = std::vector<T, short_alloc<T, BufSize, alignof(T)>>;
template <class T, std::size_t BufSize = 64, std::size_t ElementAlignment = alignof(T)>
using SmallVector = std::vector<T, short_alloc<T, BufSize, ElementAlignment>>;

} // namespace containers
} // namespace arangodb
Expand Down
0