[Libreoffice-commits] core.git: bridges/source
Stephan Bergmann
sbergman at redhat.com
Sat Feb 11 17:32:35 UTC 2017
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_mips/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_s390/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 4 ----
bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 4 ----
19 files changed, 76 deletions(-)
New commits:
commit 61396df4f4b0ec955554bf90e61a31f998592b07
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 11 18:32:05 2017 +0100
LEAK_STATIC_DATA is only ever defined for WNT
Change-Id: I1aa7b56b44e5efc8ad407c8d0fe09927f622b5e7
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 2e22d92..c5117ac 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -231,12 +231,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index d4ecf85..7273076 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -298,12 +298,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index bd7164c..74dabc8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -229,12 +229,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 53319a4..44da1cd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -266,12 +266,8 @@ namespace CPPU_CURRENT_NAMESPACE
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 14d3750..855e75c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -242,12 +242,8 @@ namespace CPPU_CURRENT_NAMESPACE
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 76755f8..95688e3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -228,12 +228,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 4c5105d..3a67731 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -241,12 +241,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = s_rtti->getRTTI(reinterpret_cast<typelib_CompoundTypeDescription *>(pTypeDescr));
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 544e72e..6f0581d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -242,12 +242,8 @@ namespace CPPU_CURRENT_NAMESPACE
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 44ef70b..5022053 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -239,12 +239,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
index 339bd27..0e65372 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
@@ -240,12 +240,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index e70a5df..225a241 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -230,12 +230,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index 76755f8..95688e3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -228,12 +228,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index bd7164c..74dabc8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -229,12 +229,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index abf406c..6049fb5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -229,12 +229,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 720e4d6..261339c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -240,12 +240,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
index 720e4d6..261339c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
@@ -240,12 +240,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 547a2d7..53fb3c8 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -303,12 +303,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = s_rtti->getRTTI( reinterpret_cast<typelib_CompoundTypeDescription *>(pTypeDescr) );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 7308f3e..8e403ac 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -242,12 +242,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 472863a..7b95700 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -239,12 +239,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
static RTTI rtti_data;
s_rtti = &rtti_data;
-#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
More information about the Libreoffice-commits
mailing list