Fixing compiler problems with hpx::util::optional and GCC

STEllAR-GROUP · Nov 22, 2017 · decc278 · decc278
1 parent 563705e
commit decc278
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1414,6 +1414,8 @@ else()
     # Uninitialized variables are bad, earlier compilers issue spurious warnings
     hpx_add_compile_flag_if_available(-Werror=uninitialized LANGUAGES CXX C)
     hpx_add_compile_flag_if_available(-Wno-unused-local-typedefs LANGUAGES CXX C)
+    # -Werror=maybe-uninitialized leads to false positives.
+    hpx_add_compile_flag_if_available(-Wno-maybe-unitialized LANGUAGES CXX C)
   endif()
 
   # Silence warning about __sync_fetch_and_nand changing semantics

diff --git a/hpx/util/optional.hpp b/hpx/util/optional.hpp
@@ -293,15 +293,9 @@ namespace hpx { namespace util
     template <typename T>
     constexpr bool operator==(optional<T> const& lhs, optional<T> const& rhs)
     {
-        if (bool(lhs) != bool(rhs))
-        {
-            return false;
-        }
-        if (!bool(lhs) && !bool(rhs))
-        {
-            return true;
-        }
-        return *lhs == *rhs;
+        return (bool(lhs) != bool(rhs)) ? false :
+            (!bool(lhs) && !bool(rhs)) ? true :
+            (*lhs == *rhs);
     }
 
     template <typename T>
@@ -313,15 +307,7 @@ namespace hpx { namespace util
     template <typename T>
     constexpr bool operator<(optional<T> const& lhs, optional<T> const& rhs)
     {
-        if (!bool(rhs))
-        {
-            return false;
-        }
-        if (!bool(lhs))
-        {
-            return true;
-        }
-        return *rhs < *lhs;
+        return (!bool(rhs)) ? false : (!bool(lhs)) ? true : *rhs < *lhs;
     }
 
     template <typename T>
@@ -333,15 +319,7 @@ namespace hpx { namespace util
     template <typename T>
     constexpr bool operator>(optional<T> const& lhs, optional<T> const& rhs)
     {
-        if (!bool(lhs))
-        {
-            return false;
-        }
-        if (!bool(rhs))
-        {
-            return true;
-        }
-        return *rhs > *lhs;
+        return (!bool(rhs)) ? false : (!bool(lhs)) ? true : *rhs > *lhs;
     }
 
     template <typename T>