8000 fix for old clang (#14732) · arangodb/arangodb@d3fde79 · GitHub
[go: up one dir, main page]

Skip to content

Commit d3fde79

Browse files
authored
fix for old clang (#14732)
1 parent 2b32f6a commit d3fde79

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

arangod/Graph/ConstantWeightShortestPathFinder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class ConstantWeightShortestPathFinder : public ShortestPathFinder {
4949
PathSnippet() noexcept;
5050
PathSnippet(arangodb::velocypack::StringRef pred, graph::EdgeDocumentToken&& path) noexcept;
5151
PathSnippet(PathSnippet&& other) noexcept = default;
52-
PathSnippet& operator=(PathSnippet&& other) noexcept = default;
52+
PathSnippet& operator=(PathSnippet&& other) ARANGODB_NOEXCEPT_ASSIGN_OP = default;
5353

5454
bool empty() const noexcept {
5555
return _pred.empty();

lib/Basics/operating-system.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,14 @@
225225
#define TRI_uid_t uid_t
226226
#define TRI_gid_t gid_t
227227

228+
// noexcept
229+
230+
#if defined(__clang__) && __clang_major__ == 11 && __clang_minor__ == 0
231+
#define ARANGODB_NOEXCEPT_ASSIGN_OP /* noexcept */
232+
#else
233+
#define ARANGODB_NOEXCEPT_ASSIGN_OP noexcept
234+
#endif
235+
228236
#endif
229237

230238
// -----------------------------------------------------------------------------
@@ -372,6 +380,10 @@
372380
#define TRI_uid_t uid_t
373381
#define TRI_gid_t gid_t
374382

383+
// noexcept
384+
385+
#define ARANGODB_NOEXCEPT_ASSIGN_OP noexcept
386+
375387
#endif
376388

377389
// -----------------------------------------------------------------------------
@@ -533,6 +545,10 @@
533545
#define TRI_uid_t uid_t
534546
#define TRI_gid_t gid_t
535547

548+
// noexcept
549+
550+
#define ARANGODB_NOEXCEPT_ASSIGN_OP noexcept
551+
536552
#endif
537553

538554
// -----------------------------------------------------------------------------
@@ -768,6 +784,10 @@ void TRI_GET_ARGV_WIN(int& argc, char** argv);
768784
#define TRI_uid_t void*
769785
#define TRI_gid_t void*
770786

787+
// noexcept
788+
789+
#define ARANGODB_NOEXCEPT_ASSIGN_OP noexcept
790+
771791
#endif
772792

773793
#endif

0 commit comments

Comments
 (0)
0