diff options
Diffstat (limited to 'connectivity/source')
10 files changed, 4 insertions, 40 deletions
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h index 50a1288de251..0311aa830e73 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h @@ -32,10 +32,6 @@ #include "nsXPIDLString.h" #include "nsString.h" -#if defined __SUNPRO_CC -#pragma disable_warn - // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again -#endif #include "nsDirectoryService.h" diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h index 8b1a3024383d..6cf4e4d9f395 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h @@ -45,10 +45,6 @@ #include "nsISupports.h" #include "nsIRegistry.h" #include "nsString.h" -#if defined __SUNPRO_CC -#pragma disable_warn - // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again -#endif #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" #include "nsIDirectoryService.h" diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h index b6d9c2eae82c..432ec63712a3 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h @@ -22,10 +22,6 @@ #include "nsIDirectoryService.h" #include "nsILocalFile.h" #include "nsString.h" -#if defined __SUNPRO_CC -#pragma disable_warn - // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again -#endif #include "post_include_mozilla.h" diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h index 4320c9320edd..4bd051175087 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h @@ -22,10 +22,6 @@ #include "nsCOMPtr.h" #include "nsISupports.h" #include "nsString.h" -#if defined __SUNPRO_CC -#pragma disable_warn - // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again -#endif #include "nsIRegistry.h" #include "nsXPIDLString.h" #include "nsVoidArray.h" diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h index 8d8c2001e6e4..f8fea6b4368e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h @@ -22,10 +22,6 @@ #include "nsCOMPtr.h" #include "nsISupports.h" #include "nsString.h" -#if defined __SUNPRO_CC -#pragma disable_warn - // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again -#endif #include "nsIRegistry.h" #include "nsXPIDLString.h" #include "nsVoidArray.h" diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx index 1d452159dd51..9073f4546c38 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx @@ -34,10 +34,6 @@ #include <nsISupportsArray.h> #include <nsString.h> -#if defined __SUNPRO_CC -#pragma disable_warn - // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again -#endif #include <nsMemory.h> #include <prtypes.h> #include <nsRDFCID.h> diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h index 20753f4a0e5b..9bb7b6513313 100644 --- a/connectivity/source/drivers/mozab/post_include_mozilla.h +++ b/connectivity/source/drivers/mozab/post_include_mozilla.h @@ -20,8 +20,6 @@ #if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ && !defined __clang__ #pragma GCC diagnostic pop -#elif defined __SUNPRO_CC -#pragma enable_warn #elif defined _MSC_VER #pragma warning(pop) #endif diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index 14a7ad6c8038..17b4b02c82ff 100644 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -52,8 +52,6 @@ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" -#elif defined __SUNPRO_CC - #pragma disable_warn #elif defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable:4946 4710) diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index bdc76bd89277..39e3010369a4 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -46,9 +46,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/macros.h> -#if defined __SUNPRO_CC -#pragma disable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable:4273 4701) #endif @@ -4811,8 +4809,6 @@ int OSQLParser::SQLlex() return s_pScanner->SQLlex(); } -#if defined __SUNPRO_CC -#pragma enable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(pop) #endif diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 4cc6e0c46ea8..573cadd2144a 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -46,9 +46,7 @@ #include <connectivity/sqlparse.hxx> #include <connectivity/sqlscan.hxx> -#if defined __SUNPRO_CC -#pragma disable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(push, 1) /**/ #ifdef yywrap @@ -811,8 +809,6 @@ sal_Int32 OSQLScanner::SQLlex() return SQLyylex(); } -#if defined __SUNPRO_CC -#pragma enable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(pop) #endif |