Kaydet (Commit) c69b6417 authored tarafından Jelle van der Waa's avatar Jelle van der Waa Kaydeden (comit) Noel Grandin

fdo#72598 Remove SunStudio cruft from code base

Change-Id: Ia6799c852eb95d496fbc8dcfdabde62dffc263a6
Reviewed-on: https://gerrit.libreoffice.org/7066Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst af8191d2
......@@ -379,17 +379,11 @@ inline void SAL_CALL cppu_ext_getMapping(
//##################################################################################################
//##################################################################################################
#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
static OUString * s_pStaticOidPart = 0;
#endif
// environment init stuff
//--------------------------------------------------------------------------------------------------
inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
{
#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
static OUString * s_pStaticOidPart = 0;
#endif
if (! s_pStaticOidPart)
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
......@@ -404,12 +398,8 @@ inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
{
aRet.append( (sal_Int32)ar[i], 16 );
}
#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
#else
static OUString s_aStaticOidPart( aRet.makeStringAndClear() );
s_pStaticOidPart = &s_aStaticOidPart;
#endif
}
}
return *s_pStaticOidPart;
......
......@@ -41,15 +41,13 @@ namespace bridges { namespace cpp_uno { namespace shared {
namespace {
#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \
|| (defined(__GNUC__) && defined(__APPLE__))
#if (defined(__GNUC__) && defined(__APPLE__))
static OUString * s_pStaticOidPart = 0;
#endif
const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
{
#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \
|| (defined(__GNUC__) && defined(__APPLE__)))
#if ! (defined(__GNUC__) && defined(__APPLE__))
static OUString * s_pStaticOidPart = 0;
#endif
if (! s_pStaticOidPart)
......@@ -66,8 +64,7 @@ const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
{
aRet.append( (sal_Int32)ar[i], 16 );
}
#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \
|| (defined(__GNUC__) && defined(__APPLE__))
#if (defined(__GNUC__) && defined(__APPLE__))
s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
#else
static OUString s_aStaticOidPart(
......
......@@ -56,13 +56,6 @@ void dso_exit(void) {
}
}
#ifdef __SUNPRO_CC
# pragma init(dso_init)
# pragma fini(dso_exit)
#endif
namespace {
struct InitVtableFactory {
......
......@@ -236,8 +236,6 @@ typedef _W64 int ptrdiff_t;
#else
# if defined(__GNUC__) && __GNUC__>=4
# define GLEWAPI extern __attribute__ ((visibility("default")))
# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define GLEWAPI extern __global
# else
# define GLEWAPI extern
# endif
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......@@ -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
......@@ -210,9 +210,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) {
}
// Suppress any warnings from generated code:
#if defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#if defined _MSC_VER
#pragma warning(push, 1)
#pragma warning(disable: 4273 4701 4702)
#endif
......
......@@ -246,8 +246,6 @@ static void parseLineAndFile(sal_Char* pBuf)
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-label"
#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
/**/
......
......@@ -18,12 +18,7 @@
*/
#include <stddef.h>
/* Solaris 8 has no C99 stdint.h, and Solaris generally seems not to miss it for
SIZE_MAX: */
#if !defined __SUNPRO_C
#include <stdint.h>
#endif
#include "system.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment