remove HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE check and macro

This is supported in GCC 4.6.0 already:
https://gcc.gnu.org/onlinedocs/gcc-4.6.0/gcc/Diagnostic-Pragmas.html

Change-Id: I2f67e588eea3a323a2e9c81e39e56ab2e715a817

3 files changed, 44 insertions, 56 deletions

diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index 959cb13a6f77..9be0eea1c993 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -1,11 +1,10 @@
 --- boost/ptr_container/ptr_map.hpp
 +++ boost/ptr_container/ptr_map.hpp
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,11 @@
  # pragma once
  #endif
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
@@ -17,19 +16,18 @@
  
  }
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif
 --- boost/ptr_container/ptr_map_adapter.hpp
 +++ boost/ptr_container/ptr_map_adapter.hpp
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,11 @@
  # pragma once
  #endif
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
@@ -41,19 +39,18 @@
      
  } // namespace 'boost'  
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif
 --- boost/ptr_container/ptr_set_adapter.hpp
 +++ boost/ptr_container/ptr_set_adapter.hpp
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,11 @@
  # pragma once
  #endif
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
@@ -65,19 +62,18 @@
  
  } // namespace 'boost'  
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif
 --- boost/ptr_container/ptr_sequence_adapter.hpp
 +++ boost/ptr_container/ptr_sequence_adapter.hpp
-@@ -16,6 +16,11 @@
+@@ -16,6 +16,10 @@
  # pragma once
  #endif
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
@@ -88,19 +84,18 @@
  
  } // namespace 'boost'  
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif
 --- boost/ptr_container/ptr_vector.hpp
 +++ boost/ptr_container/ptr_vector.hpp
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,11 @@
  # pragma once
  #endif
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
@@ -112,19 +107,18 @@
      
  }
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif
 --- boost/smart_ptr/detail/shared_count.hpp
 +++ boost/smart_ptr/detail/shared_count.hpp
-@@ -18,6 +18,12 @@
+@@ -18,6 +18,11 @@
  // http://www.boost.org/LICENSE_1_0.txt)
  //
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
@@ -136,19 +130,18 @@
  # pragma warn .8027     // Functions containing try are not expanded inline
  #endif
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif  // #ifndef BOOST_SMART_PTR_DETAIL_SHARED_COUNT_HPP_INCLUDED
 --- boost/smart_ptr/scoped_ptr.hpp
 +++ boost/smart_ptr/scoped_ptr.hpp
-@@ -11,6 +11,12 @@
+@@ -11,6 +11,11 @@
  //  http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
  //
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
@@ -160,19 +153,18 @@
  
  } // namespace boost
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif // #ifndef BOOST_SMART_PTR_SCOPED_PTR_HPP_INCLUDED
 --- boost/smart_ptr/shared_ptr.hpp
 +++ boost/smart_ptr/shared_ptr.hpp
-@@ -14,6 +14,12 @@
+@@ -14,6 +14,11 @@
  //  See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
  //
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
@@ -180,12 +172,11 @@
  #include <boost/config.hpp>   // for broken compiler workarounds
  
  #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
-@@ -1036,4 +1036,9 @@
+@@ -1036,4 +1036,8 @@
  
  #endif  // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
diff --git a/external/boost/boost_1_44_0-clang-warnings.patch b/external/boost/boost_1_44_0-clang-warnings.patch
index d5b934b5f0ec..a71cc2f5a890 100644
--- a/external/boost/boost_1_44_0-clang-warnings.patch
+++ b/external/boost/boost_1_44_0-clang-warnings.patch
@@ -1,11 +1,10 @@
 --- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
 +++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,11 @@
  #ifndef BOOST_RANDOM_LAGGED_FIBONACCI_HPP
  #define BOOST_RANDOM_LAGGED_FIBONACCI_HPP
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wshadow"
 +#endif
@@ -17,19 +16,18 @@
  
  } // namespace boost
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif // BOOST_RANDOM_LAGGED_FIBONACCI_HPP
 --- misc/boost_1_44_0/boost/random/shuffle_output.hpp
 +++ misc/build/boost_1_44_0/boost/random/shuffle_output.hpp
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,11 @@
  #ifndef BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
  #define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wshadow"
 +#endif
@@ -41,19 +39,18 @@
  }
  }
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
  #endif // BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
 --- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp
 +++ misc/build/boost_1_44_0/boost/random/subtract_with_carry.hpp
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,11 @@
  #ifndef BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
  #define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
  
-+#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wshadow"
 +#endif
@@ -65,7 +62,7 @@
  } // namespace random
  } // namespace boost
  
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
 +# pragma GCC diagnostic pop
 +#endif
 +
diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch
index 5f602c2ffa1c..dc20d198170c 100644
--- a/external/clucene/patches/clucene-warnings.patch
+++ b/external/clucene/patches/clucene-warnings.patch
@@ -5,7 +5,7 @@
  #define _lucene_analysis_AnalysisHeader_
  
 +#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Woverloaded-virtual"
 +#endif
@@ -18,7 +18,7 @@
  
  CL_NS_END
 +
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic pop
 +#endif
  #endif
@@ -29,7 +29,7 @@
  #define _lucene_search_Searcher_
  
 +#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Woverloaded-virtual"
 +#endif
@@ -42,7 +42,7 @@
  
  CL_NS_END
 +
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic pop
 +#endif
  #endif
@@ -53,7 +53,7 @@
  #define _lucene_store_IndexInput_
  
 +#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Woverloaded-virtual"
 +#endif
@@ -66,7 +66,7 @@
  	};
  CL_NS_END
 +
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic pop
 +#endif
  #endif
@@ -77,7 +77,7 @@
  #define _lucene_util_Array_
  
 +#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wshadow"
 +# pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -91,7 +91,7 @@
  
  CL_NS_END
 +
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic pop
 +#endif
  #endif
@@ -102,7 +102,7 @@
  #define _lucene_util_PriorityQueue_
  
 +#include <config_global.h>
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wshadow"
 +#endif
@@ -115,7 +115,7 @@
  
  CL_NS_END
 +
-+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++#if defined(__GNUC__)
 +# pragma GCC diagnostic pop
 +#endif
  #endif