Utility: improve string move noexcept workaround on libstdc++ < 5.5.

mosra · Dec 3, 2018 · c09a22e · c09a22e
1 parent 7714f2d
commit c09a22e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Corrade/Utility/FileWatcher.cpp b/src/Corrade/Utility/FileWatcher.cpp
@@ -58,7 +58,9 @@ FileWatcher::~FileWatcher() = default;
 
 FileWatcher& FileWatcher::operator=(FileWatcher&&)
     /* See the header for details */
-    #if (!defined(__clang__) && !defined(__GNUC__)) || __clang_major__*100 + __clang_minor__ > 308 || __GNUC__*100 + __GNUC_MINOR__ >= 505
+    #ifdef __GNUC__
+    noexcept(std::is_nothrow_move_assignable<std::string>::value)
+    #else
     noexcept
     #endif
     = default;

diff --git a/src/Corrade/Utility/FileWatcher.h b/src/Corrade/Utility/FileWatcher.h
@@ -85,10 +85,13 @@ class CORRADE_UTILITY_EXPORT FileWatcher {
             /* std::string move assignment in libstdc++ before 5.5 is not
                noexcept: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58265
                It went through on GCC 4.7, but apparently only because it
-               doesn't care. This also affect Clang 3.8 I'm using on Travis CI
-               for ASan builds and since it's impossible to check for a
-               libstdc++ version, I'm disabling it for Clang as well. */
-            #if (!defined(__clang__) && !defined(__GNUC__)) || __clang_major__*100 + __clang_minor__ > 308 || __GNUC__*100 + __GNUC_MINOR__ >= 505
+               doesn't care; it causes build failure on Clang in case it's
+               using libstdc++ < 5.5. Since it's impossible to check for a
+               libstdc++ version when using Clang (the version number is A
+               RELEASE DATE, wtf!), I'm checking for it this way. */
+            #ifdef __GNUC__
+            noexcept(std::is_nothrow_move_assignable<std::string>::value)
+            #else
             noexcept
             #endif
             ;