Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / gil / concepts / concept_check.hpp

diff --git a/boost/gil/concepts/concept_check.hpp b/boost/gil/concepts/concept_check.hpp
index 1088401..6c60d69 100644 (file)
--- a/boost/gil/concepts/concept_check.hpp
+++ b/boost/gil/concepts/concept_check.hpp
@@ -12,12 +12,14 @@
 
 #if defined(BOOST_CLANG)
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wconversion"
 #pragma clang diagnostic ignored "-Wfloat-equal"
 #pragma clang diagnostic ignored "-Wuninitialized"
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40900)
 #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 #pragma GCC diagnostic ignored "-Wuninitialized"
 #endif
@@ -28,7 +30,7 @@
 #pragma clang diagnostic pop
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40900)
 #pragma GCC diagnostic pop
 #endif