Merge branch 'develop'

boostorg · Jul 30, 2024 · 64bb944 · 64bb944
2 parents e8ed8fe + 1f74580
commit 64bb944
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/boost/leaf/config.hpp b/include/boost/leaf/config.hpp
@@ -214,8 +214,8 @@
 #       define BOOST_LEAF_ATTRIBUTE_NODISCARD [[nodiscard]]
 #   endif
 #elif defined(__has_cpp_attribute)
-    //clang-6 accepts [[nodiscard]] with -std=c++14, but warns about it -pedantic
-#   if __has_cpp_attribute(nodiscard) && !(defined(__clang__) && (__cplusplus < 201703L)) && !(defined(__GNUC__) && (__cplusplus < 201100))
+// require c++17 regardless of compiler
+#   if __has_cpp_attribute(nodiscard) && __cplusplus >= 201703L
 #       define BOOST_LEAF_ATTRIBUTE_NODISCARD [[nodiscard]]
 #   endif
 #endif
@@ -257,7 +257,7 @@
 ////////////////////////////////////////
 
 #ifdef __GNUC__
-#   define BOOST_LEAF_SYMBOL_VISIBLE __attribute__((__visibility__("default")))
+#   define BOOST_LEAF_SYMBOL_VISIBLE [[gnu::visibility("default")]]
 #else
 #   define BOOST_LEAF_SYMBOL_VISIBLE
 #endif

diff --git a/include/boost/leaf/result.hpp b/include/boost/leaf/result.hpp
@@ -174,7 +174,7 @@ namespace leaf_detail
 ////////////////////////////////////////
 
 template <class T>
-class BOOST_LEAF_SYMBOL_VISIBLE result
+class BOOST_LEAF_SYMBOL_VISIBLE BOOST_LEAF_ATTRIBUTE_NODISCARD result
 {
     template <class U>
     friend class result;
@@ -620,7 +620,7 @@ namespace leaf_detail
 }
 
 template <>
-class BOOST_LEAF_SYMBOL_VISIBLE result<void>:
+class BOOST_LEAF_SYMBOL_VISIBLE BOOST_LEAF_ATTRIBUTE_NODISCARD result<void>:
     result<leaf_detail::void_>
 {
     template <class U>