8000 Bug fix 3.8/mac 10 4 by fceller · Pull Request #14732 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Bug fix 3.8/mac 10 4 #14732

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

Merged
merged 1 commit into from
Sep 5, 2021
Merged

Bug fix 3.8/mac 10 4 #14732

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
2 changes: 1 addition & 1 deletion arangod/Graph/ConstantWeightShortestPathFinder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ConstantWeightShortestPathFinder : public ShortestPathFinder {
PathSnippet() noexcept;
PathSnippet(arangodb::velocypack::StringRef pred, graph::EdgeDocumentToken&& path) noexcept;
PathSnippet(PathSnippet&& other) noexcept = default;
PathSnippet& operator=(PathSnippet&& other) noexcept = default;
PathSnippet& operator=(PathSnippet&& other) ARANGODB_NOEXCEPT_ASSIGN_OP = default;

bool empty() const noexcept {
return _pred.empty();
Expand Down
20 changes: 20 additions & 0 deletions lib/Basics/operating-system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,14 @@
#define TRI_uid_t uid_t
#define TRI_gid_t gid_t

// noexcept

#if defined(__clang__) && __clang_major__ == 11 && __clang_minor__ == 0
#define ARANGODB_NOEXCEPT_ASSIGN_OP /* noexcept */
#else
#define ARANGODB_NOEXCEPT_ASSIGN_OP noexcept
#endif

#endif

// -----------------------------------------------------------------------------
Expand Down Expand Up @@ -372,6 +380,10 @@
#define TRI_uid_t uid_t
#define TRI_gid_t gid_t

// noexcept

#define ARANGODB_NOEXCEPT_ASSIGN_OP noexcept

#endif

// -----------------------------------------------------------------------------
Expand Down Expand Up @@ -533,6 +545,10 @@
#define TRI_uid_t uid_t
#define TRI_gid_t gid_t

// noexcept

#define ARANGODB_NOEXCEPT_ASSIGN_OP noexcept

#endif

// -----------------------------------------------------------------------------
Expand Down Expand Up @@ -768,6 +784,10 @@ void TRI_GET_ARGV_WIN(int& argc, char** argv);
#define TRI_uid_t void*
#define TRI_gid_t void*

// noexcept

#define ARANGODB_NOEXCEPT_ASSIGN_OP noexcept

#endif

#endif
0