diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-12-12 21:42:10 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2013-12-13 09:07:07 +0000 |
| commit | c69b6417af9d03b81813e6d56cdd082d511aef24 (patch) | |
| tree | f0ce56a3c925f2a914492a3b1029ed875ea2ec80 /bridges | |
| parent | af8191d2fa6bc7fce9020fd75c44c78d87cc1d75 (diff) | |
fdo#72598 Remove SunStudio cruft from code base
Change-Id: Ia6799c852eb95d496fbc8dcfdabde62dffc263a6
Reviewed-on: https://gerrit.libreoffice.org/7066
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/bridge.hxx | 10 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/shared/component.cxx | 9 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 7 |
3 files changed, 3 insertions, 23 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index 15d8eb896eec..ba9a847bc48c 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -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; diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index a7d2e22d133f..bacd9a721348 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -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( diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx index 35b2f2c8acf5..e511627d5d54 100644 --- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx @@ -56,13 +56,6 @@ void dso_exit(void) { } } -#ifdef __SUNPRO_CC -# pragma init(dso_init) -# pragma fini(dso_exit) -#endif - - - namespace { struct InitVtableFactory { |