gha

boostorg · Dec 10, 2023 · c4b0462 · c4b0462
1 parent 0474765
commit c4b0462
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/include/boost/leaf/error.hpp b/include/boost/leaf/error.hpp
@@ -71,7 +71,7 @@ namespace boost { namespace leaf {
 class BOOST_LEAF_SYMBOL_VISIBLE error_id;
 
 template <class T>
-class BOOST_LEAF_SYMBOL_VISIBLE result;
+class BOOST_LEAF_SYMBOL_VISIBLE BOOST_LEAF_NODISCARD result;
 
 namespace leaf_detail
 {

diff --git a/include/boost/leaf/exception.hpp b/include/boost/leaf/exception.hpp
@@ -223,7 +223,7 @@ template <class... E>
 #ifndef BOOST_LEAF_NO_EXCEPTIONS
 
 template <class T>
-class result;
+class BOOST_LEAF_SYMBOL_VISIBLE BOOST_LEAF_NODISCARD result;
 
 namespace leaf_detail
 {

diff --git a/include/boost/leaf/handle_errors.hpp b/include/boost/leaf/handle_errors.hpp
@@ -12,7 +12,7 @@
 namespace boost { namespace leaf {
 
 template <class T>
-class result;
+class BOOST_LEAF_SYMBOL_VISIBLE BOOST_LEAF_NODISCARD result;
 
 ////////////////////////////////////////
 

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_NODISCARD BOOST_LEAF_SYMBOL_VISIBLE result
+class BOOST_LEAF_SYMBOL_VISIBLE BOOST_LEAF_NODISCARD result
 {
     template <class U>
     friend class result;
@@ -607,7 +607,7 @@ namespace leaf_detail
 }
 
 template <>
-class BOOST_LEAF_NODISCARD BOOST_LEAF_SYMBOL_VISIBLE result<void>:
+class BOOST_LEAF_SYMBOL_VISIBLE BOOST_LEAF_NODISCARD result<void>:
     result<leaf_detail::void_>
 {
     template <class U>

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
@@ -25,7 +25,7 @@ project
         <define>BOOST_LEAF_BOOST_AVAILABLE
         <threading>single:<define>BOOST_LEAF_NO_THREADS
         <toolset>gcc:<cxxflags>"-Wno-delete-non-virtual-dtor -Wno-parentheses"
-        <toolset>clang:<cxxflags>"-Wno-unused-variable -Wno-delete-non-virtual-dtor -Wno-non-virtual-dtor -Wno-delete-non-abstract-non-virtual-dtor -Wno-dangling-else"
+        <toolset>clang:<cxxflags>"-Wno-unused-variable -Wno-delete-non-virtual-dtor -Wno-non-virtual-dtor -Wno-dangling-else"
         <toolset>darwin:<cxxflags>"-Wno-unused-variable -Wno-delete-non-virtual-dtor -Wno-non-virtual-dtor -Wno-delete-non-abstract-non-virtual-dtor -Wno-dangling-else"
         <toolset>msvc:<cxxflags>"-wd 4267 -wd 4996 -wd 4244"
         <include>../../..