From c4b0462b4f61fc7722188c987b9c8105269b5af5 Mon Sep 17 00:00:00 2001
From: Emil Dotchevski <emildotchevski@gmail.com>
Date: Sun, 10 Dec 2023 11:32:18 -0800
Subject: [PATCH] gha

---
 include/boost/leaf/error.hpp         | 2 +-
 include/boost/leaf/exception.hpp     | 2 +-
 include/boost/leaf/handle_errors.hpp | 2 +-
 include/boost/leaf/result.hpp        | 4 ++--
 test/Jamfile.v2                      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boost/leaf/error.hpp b/include/boost/leaf/error.hpp
index c845e6b0..404f33ec 100644
--- 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
index 2de4a29a..2e74ccc3 100644
--- 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
index 5dba06ef..2aace214 100644
--- 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
index 57a4df4a..ea63aa4d 100644
--- 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
index fe4aaeb8..b11d244e 100644
--- 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>../../..