lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master 10c13bf 1/3: Don't interleave diagnostic push


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 10c13bf 1/3: Don't interleave diagnostic push/pop pragmas for clang
Date: Fri, 16 Apr 2021 20:17:59 -0400 (EDT)

branch: master
commit 10c13bfdbfc90f3f27708eeec355f82742e0590a
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Don't interleave diagnostic push/pop pragmas for clang
    
    Same rationale as commit 1192bc58a3c7 of 20210416T1120Z.
---
 boost_regex.hpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/boost_regex.hpp b/boost_regex.hpp
index 5c90b4c..c69fc7e 100644
--- a/boost_regex.hpp
+++ b/boost_regex.hpp
@@ -32,7 +32,8 @@
 #   pragma clang diagnostic ignored "-Wkeyword-macro"
 #   pragma clang diagnostic ignored "-Wparentheses-equality"
 #   pragma clang diagnostic ignored "-Wregister"
-#elif defined LMI_GCC
+#endif // defined LMI_CLANG
+#if defined LMI_GCC
 #   pragma GCC diagnostic push
 #   if 7 <= __GNUC__
 #       pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
@@ -46,10 +47,11 @@
 #   pragma GCC diagnostic ignored "-Wuseless-cast"
 #endif // defined LMI_GCC
 #include <boost/regex.hpp>
-#if defined LMI_CLANG
-#   pragma clang diagnostic pop
-#elif defined LMI_GCC
+#if defined LMI_GCC
 #   pragma GCC diagnostic pop
 #endif // defined LMI_GCC
+#if defined LMI_CLANG
+#   pragma clang diagnostic pop
+#endif // defined LMI_CLANG
 
 #endif // boost_regex_hpp



reply via email to

[Prev in Thread] Current Thread [Next in Thread]