mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE check and macro

Browse Source 
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
This commit is contained in:
Michael Stahl 2014-10-02 18:15:41 +02:00
parent 86cd29772e
commit 3b59dbbffd
15 changed files with 61 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
View File

@ -94,14 +94,14 @@ std::type_info * createFake_si_class_type_info(
} }
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#endif #endif
void dummy_can_throw_anything( char const * ) void dummy_can_throw_anything( char const * )
{ {
} }
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

1
config_host/config_global.h.in
View File

@ -17,7 +17,6 @@ Any change in this header will cause a rebuild of almost everything.
#define HAVE_CXX11_FINAL 0 #define HAVE_CXX11_FINAL 0
#define HAVE_CXX11_PERFECT_FORWARDING 0 #define HAVE_CXX11_PERFECT_FORWARDING 0
#define HAVE_GCC_BUILTIN_ATOMIC 0 #define HAVE_GCC_BUILTIN_ATOMIC 0
#define HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE 0
/* _Pragma */ /* _Pragma */
#define HAVE_GCC_PRAGMA_OPERATOR 0 #define HAVE_GCC_PRAGMA_OPERATOR 0
#define HAVE_GCC_DEPRECATED_MESSAGE 0 #define HAVE_GCC_DEPRECATED_MESSAGE 0

14
configure.ac
View File

@ -5789,20 +5789,6 @@ if test "$GCC" = "yes"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_MSG_CHECKING([whether $CC supports pragma GCC diagnostic push/pop])
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror -Wunknown-pragmas -Wunused-parameter"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
void dummy(int n) {}
#pragma GCC diagnostic pop
])], [
AC_DEFINE([HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE],[1])
AC_MSG_RESULT([yes])
], [AC_MSG_RESULT([no])])
CFLAGS=$save_CFLAGS
AC_MSG_CHECKING([whether $CC supports __attribute__((deprecated(message)))]) AC_MSG_CHECKING([whether $CC supports __attribute__((deprecated(message)))])
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror" CFLAGS="$CFLAGS -Werror"

3
connectivity/source/drivers/mozab/post_include_mozilla.h
View File

@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ #if defined __GNUC__ && !defined __clang__
&& !defined __clang__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#elif defined _MSC_VER #elif defined _MSC_VER
#pragma warning(pop) #pragma warning(pop)

3
connectivity/source/drivers/mozab/pre_include_mozilla.h
View File

@ -48,8 +48,7 @@
#endif #endif
#endif #endif
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ #if defined __GNUC__ && !defined __clang__
&& !defined __clang__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#elif defined _MSC_VER #elif defined _MSC_VER

59
external/boost/boost.wdeprecated-auto_ptr.patch.0 vendored
View File

@ -1,11 +1,10 @@
--- boost/ptr_container/ptr_map.hpp --- boost/ptr_container/ptr_map.hpp
+++ boost/ptr_container/ptr_map.hpp +++ boost/ptr_container/ptr_map.hpp
@@ -16,6 +16,12 @@ @@ -16,6 +16,11 @@
# pragma once # pragma once
#endif #endif
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif +#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 +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif #endif
--- boost/ptr_container/ptr_map_adapter.hpp --- boost/ptr_container/ptr_map_adapter.hpp
+++ boost/ptr_container/ptr_map_adapter.hpp +++ boost/ptr_container/ptr_map_adapter.hpp
@@ -16,6 +16,12 @@ @@ -16,6 +16,11 @@
# pragma once # pragma once
#endif #endif
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif +#endif
@ -41,19 +39,18 @@
} // namespace 'boost' } // namespace 'boost'
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif #endif
--- boost/ptr_container/ptr_set_adapter.hpp --- boost/ptr_container/ptr_set_adapter.hpp
+++ boost/ptr_container/ptr_set_adapter.hpp +++ boost/ptr_container/ptr_set_adapter.hpp
@@ -16,6 +16,12 @@ @@ -16,6 +16,11 @@
# pragma once # pragma once
#endif #endif
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif +#endif
@ -65,19 +62,18 @@
} // namespace 'boost' } // namespace 'boost'
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif #endif
--- boost/ptr_container/ptr_sequence_adapter.hpp --- boost/ptr_container/ptr_sequence_adapter.hpp
+++ boost/ptr_container/ptr_sequence_adapter.hpp +++ boost/ptr_container/ptr_sequence_adapter.hpp
@@ -16,6 +16,11 @@ @@ -16,6 +16,10 @@
# pragma once # pragma once
#endif #endif
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif +#endif
@ -88,19 +84,18 @@
} // namespace 'boost' } // namespace 'boost'
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif #endif
--- boost/ptr_container/ptr_vector.hpp --- boost/ptr_container/ptr_vector.hpp
+++ boost/ptr_container/ptr_vector.hpp +++ boost/ptr_container/ptr_vector.hpp
@@ -16,6 +16,12 @@ @@ -16,6 +16,11 @@
# pragma once # pragma once
#endif #endif
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif +#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 +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif #endif
--- boost/smart_ptr/detail/shared_count.hpp --- boost/smart_ptr/detail/shared_count.hpp
+++ 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) // http://www.boost.org/LICENSE_1_0.txt)
// //
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif +#endif
@ -136,19 +130,18 @@
# pragma warn .8027 // Functions containing try are not expanded inline # pragma warn .8027 // Functions containing try are not expanded inline
#endif #endif
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif // #ifndef BOOST_SMART_PTR_DETAIL_SHARED_COUNT_HPP_INCLUDED #endif // #ifndef BOOST_SMART_PTR_DETAIL_SHARED_COUNT_HPP_INCLUDED
--- boost/smart_ptr/scoped_ptr.hpp --- boost/smart_ptr/scoped_ptr.hpp
+++ 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 // http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
// //
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif +#endif
@ -160,19 +153,18 @@
} // namespace boost } // namespace boost
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif // #ifndef BOOST_SMART_PTR_SCOPED_PTR_HPP_INCLUDED #endif // #ifndef BOOST_SMART_PTR_SCOPED_PTR_HPP_INCLUDED
--- boost/smart_ptr/shared_ptr.hpp --- boost/smart_ptr/shared_ptr.hpp
+++ 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. // See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
// //
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif +#endif
@ -180,12 +172,11 @@
#include <boost/config.hpp> // for broken compiler workarounds #include <boost/config.hpp> // for broken compiler workarounds
#if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) #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) #endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
+ +

21
external/boost/boost_1_44_0-clang-warnings.patch vendored
View File

@ -1,11 +1,10 @@
--- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp --- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
+++ misc/build/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 #ifndef BOOST_RANDOM_LAGGED_FIBONACCI_HPP
#define BOOST_RANDOM_LAGGED_FIBONACCI_HPP #define BOOST_RANDOM_LAGGED_FIBONACCI_HPP
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wshadow"
+#endif +#endif
@ -17,19 +16,18 @@
} // namespace boost } // namespace boost
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif // BOOST_RANDOM_LAGGED_FIBONACCI_HPP #endif // BOOST_RANDOM_LAGGED_FIBONACCI_HPP
--- misc/boost_1_44_0/boost/random/shuffle_output.hpp --- misc/boost_1_44_0/boost/random/shuffle_output.hpp
+++ misc/build/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 #ifndef BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
#define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP #define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wshadow"
+#endif +#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 +# pragma GCC diagnostic pop
+#endif +#endif
+ +
#endif // BOOST_RANDOM_SHUFFLE_OUTPUT_HPP #endif // BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
--- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp --- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp
+++ misc/build/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 #ifndef BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
#define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP #define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
+#include <config_global.h> +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wshadow"
+#endif +#endif
@ -65,7 +62,7 @@
} // namespace random } // namespace random
} // namespace boost } // namespace boost
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
+ +

20
external/clucene/patches/clucene-warnings.patch vendored
View File

@ -5,7 +5,7 @@
#define _lucene_analysis_AnalysisHeader_ #define _lucene_analysis_AnalysisHeader_
+#include <config_global.h> +#include <config_global.h>
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Woverloaded-virtual" +# pragma GCC diagnostic ignored "-Woverloaded-virtual"
+#endif +#endif
@ -18,7 +18,7 @@
CL_NS_END CL_NS_END
+ +
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
#endif #endif
@ -29,7 +29,7 @@
#define _lucene_search_Searcher_ #define _lucene_search_Searcher_
+#include <config_global.h> +#include <config_global.h>
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Woverloaded-virtual" +# pragma GCC diagnostic ignored "-Woverloaded-virtual"
+#endif +#endif
@ -42,7 +42,7 @@
CL_NS_END CL_NS_END
+ +
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
#endif #endif
@ -53,7 +53,7 @@
#define _lucene_store_IndexInput_ #define _lucene_store_IndexInput_
+#include <config_global.h> +#include <config_global.h>
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Woverloaded-virtual" +# pragma GCC diagnostic ignored "-Woverloaded-virtual"
+#endif +#endif
@ -66,7 +66,7 @@
}; };
CL_NS_END CL_NS_END
+ +
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
#endif #endif
@ -77,7 +77,7 @@
#define _lucene_util_Array_ #define _lucene_util_Array_
+#include <config_global.h> +#include <config_global.h>
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wshadow"
+# pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic ignored "-Wunused-parameter"
@ -91,7 +91,7 @@
CL_NS_END CL_NS_END
+ +
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
#endif #endif
@ -102,7 +102,7 @@
#define _lucene_util_PriorityQueue_ #define _lucene_util_PriorityQueue_
+#include <config_global.h> +#include <config_global.h>
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic push +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wshadow"
+#endif +#endif
@ -115,7 +115,7 @@
CL_NS_END CL_NS_END
+ +
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +#if defined(__GNUC__)
+# pragma GCC diagnostic pop +# pragma GCC diagnostic pop
+#endif +#endif
#endif #endif

6
include/cppuhelper/propertysetmixin.hxx
View File

@ -80,8 +80,7 @@ template< typename T > class PropertySetMixin;
@since UDK 3.2.1 @since UDK 3.2.1
*/ */
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ #if defined __GNUC__ && !defined __clang__
&& !defined __clang__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif #endif
@ -478,8 +477,7 @@ private:
PropertySetMixin( const PropertySetMixin&); // not defined PropertySetMixin( const PropertySetMixin&); // not defined
void operator=( const PropertySetMixin&); // not defined void operator=( const PropertySetMixin&); // not defined
}; };
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ #if defined __GNUC__ && !defined __clang__
&& !defined __clang__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

2
include/sal/types.h
View File

@ -497,7 +497,7 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
SAL_WNODEPRECATED_DECLARATIONS_POP SAL_WNODEPRECATED_DECLARATIONS_POP
*/ */
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_OPERATOR #if HAVE_GCC_PRAGMA_OPERATOR
#define SAL_WNODEPRECATED_DECLARATIONS_PUSH \ #define SAL_WNODEPRECATED_DECLARATIONS_PUSH \
_Pragma(SAL_STRINGIFY_ARG(GCC diagnostic push)) \ _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic push)) \
_Pragma(SAL_STRINGIFY_ARG(GCC diagnostic ignored "-Wdeprecated-declarations")) _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic ignored "-Wdeprecated-declarations"))

4
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
View File

@ -23,10 +23,8 @@
#include <sal/types.h> #include <sal/types.h>
#if defined __GNUC__ #if defined __GNUC__
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-parameter" # pragma GCC diagnostic ignored "-Wunused-parameter"
#endif
#elif defined _MSC_VER #elif defined _MSC_VER
#pragma warning(push, 1) #pragma warning(push, 1)
#endif #endif
@ -41,9 +39,7 @@
#include "PDFDoc.h" #include "PDFDoc.h"
#if defined __GNUC__ #if defined __GNUC__
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif
#elif defined _MSC_VER #elif defined _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif #endif

4
ucb/source/ucp/gio/gio_mount.cxx
View File

@ -22,12 +22,12 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#endif #endif
G_DEFINE_TYPE (OOoMountOperation, ooo_mount_operation, G_TYPE_MOUNT_OPERATION); G_DEFINE_TYPE (OOoMountOperation, ooo_mount_operation, G_TYPE_MOUNT_OPERATION);
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

4
ucb/source/ucp/webdav-neon/NeonTypes.hxx
View File

@ -35,12 +35,12 @@
#include <ne_basic.h> #include <ne_basic.h>
#include <ne_props.h> #include <ne_props.h>
#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #if defined(__GNUC__)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wshadow" # pragma GCC diagnostic ignored "-Wshadow"
#endif #endif
#include <ne_locks.h> #include <ne_locks.h>
#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #if defined(__GNUC__)
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif

8
vcl/unx/gtk/window/gloactiongroup.cxx
View File

@ -39,12 +39,12 @@ struct _GLOAction
typedef GObjectClass GLOActionClass; typedef GObjectClass GLOActionClass;
typedef struct _GLOAction GLOAction; typedef struct _GLOAction GLOAction;
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#endif #endif
G_DEFINE_TYPE (GLOAction, g_lo_action, G_TYPE_OBJECT); G_DEFINE_TYPE (GLOAction, g_lo_action, G_TYPE_OBJECT);
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
@ -106,7 +106,7 @@ struct _GLOActionGroupPrivate
static void g_lo_action_group_iface_init (GActionGroupInterface *); static void g_lo_action_group_iface_init (GActionGroupInterface *);
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#endif #endif
@ -114,7 +114,7 @@ G_DEFINE_TYPE_WITH_CODE (GLOActionGroup,
g_lo_action_group, G_TYPE_OBJECT, g_lo_action_group, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP, G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP,
g_lo_action_group_iface_init)); g_lo_action_group_iface_init));
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

4
vcl/unx/gtk/window/glomenu.cxx
View File

@ -25,12 +25,12 @@ struct _GLOMenu
typedef GMenuModelClass GLOMenuClass; typedef GMenuModelClass GLOMenuClass;
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#endif #endif
G_DEFINE_TYPE (GLOMenu, g_lo_menu, G_TYPE_MENU_MODEL); G_DEFINE_TYPE (GLOMenu, g_lo_menu, G_TYPE_MENU_MODEL);
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif