update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / outcome / convert.hpp

diff --git a/ceph/src/boost/boost/outcome/convert.hpp b/ceph/src/boost/boost/outcome/convert.hpp
index 2be391e4afe94c5b3b1dbd4e76494989399fcd55..9c0827afc072cad8ebfb982dfef93c4a3024fa03 100644 (file)
--- a/ceph/src/boost/boost/outcome/convert.hpp
+++ b/ceph/src/boost/boost/outcome/convert.hpp
@@ -1,5 +1,5 @@
 /* Says how to convert value, error and exception types
-(C) 2017-2020 Niall Douglas <http://www.nedproductions.biz/> (12 commits)
+(C) 2017-2022 Niall Douglas <http://www.nedproductions.biz/> (12 commits)
 File Created: Nov 2017
 
 
@@ -38,10 +38,10 @@ BOOST_OUTCOME_V2_NAMESPACE_EXPORT_BEGIN
 namespace concepts
 {
 #if defined(__cpp_concepts)
-#if !defined(_MSC_VER) && !defined(__clang__) && (__GNUC__ < 9 || __cplusplus < 202000L)
-#define BOOST_OUTCOME_GCC6_CONCEPT_BOOL bool
-#else
+#if (defined(_MSC_VER) || defined(__clang__) || (defined(__GNUC__) && __cpp_concepts >= 201707) || BOOST_OUTCOME_FORCE_STD_BOOST_OUTCOME_C_CONCEPTS) && !BOOST_OUTCOME_FORCE_LEGACY_GCC_BOOST_OUTCOME_C_CONCEPTS
 #define BOOST_OUTCOME_GCC6_CONCEPT_BOOL
+#else
+#define BOOST_OUTCOME_GCC6_CONCEPT_BOOL bool
 #endif
   namespace detail
   {