From 80697e7c0f1f72b690febf832975893ad82ae351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Fri, 1 Jan 2021 23:43:44 +0100 Subject: [PATCH] #pragma GCC diagnostic push is available from GCC 4.6, not from GCC 4.5 --- bench/bench_vectors.cpp | 4 ++-- include/boost/container/allocator_traits.hpp | 4 ++-- include/boost/container/detail/flat_tree.hpp | 4 ++-- include/boost/container/detail/is_container.hpp | 4 ++-- include/boost/container/detail/is_contiguous_container.hpp | 4 ++-- test/set_test.hpp | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bench/bench_vectors.cpp b/bench/bench_vectors.cpp index 2a84757..ad6a8b8 100644 --- a/bench/bench_vectors.cpp +++ b/bench/bench_vectors.cpp @@ -22,7 +22,7 @@ #include #include -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-result" #endif @@ -36,7 +36,7 @@ #include //#pragma GCC diagnostic ignored "-Wunused-result" -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic pop #endif diff --git a/include/boost/container/allocator_traits.hpp b/include/boost/container/allocator_traits.hpp index c25921c..f5f73ef 100644 --- a/include/boost/container/allocator_traits.hpp +++ b/include/boost/container/allocator_traits.hpp @@ -49,7 +49,7 @@ #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-result" #endif @@ -75,7 +75,7 @@ #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 9 #include -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic pop #endif diff --git a/include/boost/container/detail/flat_tree.hpp b/include/boost/container/detail/flat_tree.hpp index 8debd6f..4b746d3 100644 --- a/include/boost/container/detail/flat_tree.hpp +++ b/include/boost/container/detail/flat_tree.hpp @@ -55,7 +55,7 @@ #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-result" #endif @@ -108,7 +108,7 @@ #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 0 #include -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic pop #endif diff --git a/include/boost/container/detail/is_container.hpp b/include/boost/container/detail/is_container.hpp index 461e497..8ef0274 100644 --- a/include/boost/container/detail/is_container.hpp +++ b/include/boost/container/detail/is_container.hpp @@ -18,7 +18,7 @@ # pragma once #endif -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-result" #endif @@ -40,7 +40,7 @@ #include //#pragma GCC diagnostic ignored "-Wunused-result" -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic pop #endif diff --git a/include/boost/container/detail/is_contiguous_container.hpp b/include/boost/container/detail/is_contiguous_container.hpp index a44cee0..045de84 100644 --- a/include/boost/container/detail/is_contiguous_container.hpp +++ b/include/boost/container/detail/is_contiguous_container.hpp @@ -18,7 +18,7 @@ # pragma once #endif -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-result" #endif @@ -40,7 +40,7 @@ #include //#pragma GCC diagnostic ignored "-Wunused-result" -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic pop #endif diff --git a/test/set_test.hpp b/test/set_test.hpp index f030bea..22cf4f0 100644 --- a/test/set_test.hpp +++ b/test/set_test.hpp @@ -19,7 +19,7 @@ #include #include -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-result" #endif @@ -32,7 +32,7 @@ #include //#pragma GCC diagnostic ignored "-Wunused-result" -#if defined(BOOST_GCC) && (BOOST_GCC >= 40500) +#if defined(BOOST_GCC) && (BOOST_GCC >= 40600) #pragma GCC diagnostic pop #endif