diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-23 21:55:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-25 08:52:54 +0100 |
| commit | fa545023ada3f2a5f79cab1ff628fd18434c7c2e (patch) | |
| tree | 7bb5c0f01264f9b53724baa1b0ef7b7e80e23b3d /fpicker/source/aqua/SalAquaFilePicker.mm | |
| parent | Remove unused macros from checked-in Flex/Bison output (diff) | |
| download | core-fa545023ada3f2a5f79cab1ff628fd18434c7c2e.tar.gz core-fa545023ada3f2a5f79cab1ff628fd18434c7c2e.zip | |
Introduce HAVE_GCC_PRAGMA_DIAGNOSTIC_{MODIFY,SCOPE}
...replacing hard-coded GCC version checks. Those checks that guard
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
appear relevant only for GCC itself, not Clang (which used to fail the old
guards because it typically announces itself with a rather low
__GNUC__/__GNUC_MINOR__ version), see 6e67c03dc0225fc66343546b14e902b9d238b1a3
"Enable -Wnon-virtual-dtor for GCC 4.6"
Change-Id: I6bfa4d5caa6192e7a203ce829682bf6bb8d61a1b
Diffstat (limited to 'fpicker/source/aqua/SalAquaFilePicker.mm')
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 119c00d7d22d..8d1d5bc42ef6 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> @@ -769,12 +771,12 @@ void SalAquaFilePicker::updateSaveFileNameExtension() { rtl::OUString suffix = (*(aStringList.begin())).copy(1); NSString *requiredFileType = [NSString stringWithOUString:suffix]; -#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070 +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #pragma GCC diagnostic push #pragma GCC diagnostic warning "-Wdeprecated-declarations" #endif [m_pDialog setRequiredFileType:requiredFileType]; -#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070 +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE #pragma GCC diagnostic pop #endif |