update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / gil / concepts / concept_check.hpp

diff --git a/ceph/src/boost/boost/gil/concepts/concept_check.hpp b/ceph/src/boost/boost/gil/concepts/concept_check.hpp
index 6c60d6931521860c1b33dd7fe60cfa4f05874f71..fab315d16c1adf996aeee2c7321fcef38a750ca2 100644 (file)
--- a/ceph/src/boost/boost/gil/concepts/concept_check.hpp
+++ b/ceph/src/boost/boost/gil/concepts/concept_check.hpp
@@ -12,6 +12,7 @@
 
 #if defined(BOOST_CLANG)
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
 #pragma clang diagnostic ignored "-Wconversion"
 #pragma clang diagnostic ignored "-Wfloat-equal"
 #pragma clang diagnostic ignored "-Wuninitialized"
@@ -38,17 +39,17 @@
 
 namespace boost { namespace gil {
 
-// TODO: What is GIL_CLASS_REQUIRE for; Why not use BOOST_CLASS_REQUIRE?
+// TODO: What is BOOST_GIL_CLASS_REQUIRE for; Why not use BOOST_CLASS_REQUIRE?
 // TODO: What is gil_function_requires for; Why not function_requires?
 
 #ifdef BOOST_GIL_USE_CONCEPT_CHECK
-    #define GIL_CLASS_REQUIRE(type_var, ns, concept) \
+    #define BOOST_GIL_CLASS_REQUIRE(type_var, ns, concept) \
         BOOST_CLASS_REQUIRE(type_var, ns, concept);
 
     template <typename Concept>
     void gil_function_requires() { function_requires<Concept>(); }
 #else
-    #define GIL_CLASS_REQUIRE(type_var, ns, concept)
+    #define BOOST_GIL_CLASS_REQUIRE(type_var, ns, concept)
 
     template <typename C>
     void gil_function_requires() {}