added cppu_no_leak for building non-leaking vtables/ generated rtti symbols

3 files changed, 22 insertions, 18 deletions

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index d7b54496f82c..7920e5987fd4 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cpp2uno.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-12 14:41:44 $
+ *  last change: $Author: dbo $ $Date: 2001-03-30 12:06:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,10 +59,6 @@
  *
  ************************************************************************/
 
-#define LEAK_STATIC_DATA
-//  #define TRACE(x) OSL_TRACE(x)
-#define TRACE(x)
-
 #pragma warning( disable : 4237 )
 #include <list>
 #include <malloc.h>
@@ -88,6 +84,12 @@
 
 #include "msci.hxx"
 
+#ifdef DEBUG
+#define TRACE(x) OSL_TRACE(x)
+#else
+#define TRACE(x)
+#endif
+
 using namespace std;
 using namespace rtl;
 using namespace osl;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index ac74ae077c3f..a1e0448601fe 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: except.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-12 14:41:44 $
+ *  last change: $Author: dbo $ $Date: 2001-03-30 12:06:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,6 @@
  *
  ************************************************************************/
 
-#define LEAK_STATIC_DATA
-
 #pragma warning( disable : 4237 )
 #include <hash_map>
 #include <sal/config.h>
@@ -84,12 +82,12 @@
 
 #include "msci.hxx"
 
-#ifndef DEBUG
-#undef OSL_TRACE
-#define OSL_TRACE(x)
+#ifdef DEBUG
+#define TRACE(x) OSL_TRACE(x)
+#else
+#define TRACE(x)
 #endif
 
-
 #pragma pack(push, 8)
 
 using namespace com::sun::star::uno;
@@ -209,7 +207,7 @@ RTTInfos::RTTInfos() throw ()
 //__________________________________________________________________________________________________
 RTTInfos::~RTTInfos() throw ()
 {
-    OSL_TRACE( "> freeing generated RTTI infos... <\n" );
+    TRACE( "> freeing generated RTTI infos... <\n" );
 
     MutexGuard aGuard( _aMutex );
     for ( t_string2PtrMap::const_iterator iPos( _allRTTI.begin() );
@@ -399,7 +397,7 @@ ExceptionInfos::ExceptionInfos() throw ()
 //__________________________________________________________________________________________________
 ExceptionInfos::~ExceptionInfos() throw ()
 {
-    OSL_TRACE( "> freeing exception infos... <\n" );
+    TRACE( "> freeing exception infos... <\n" );
 
     MutexGuard aGuard( _aMutex );
     for ( t_string2PtrMap::const_iterator iPos( _allRaiseInfos.begin() );
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk b/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
index 31435863d82a..3b75fa4b0da1 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
+++ b/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 15:28:49 $
+#   last change: $Author: dbo $ $Date: 2001-03-30 12:06:53 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -82,6 +82,10 @@ CFLAGS += /O2gityb2 /Gs
 CFLAGS += /Ob0
 .ENDIF
 
+.IF "$(cppu_no_leak)" == ""
+CFLAGS += -DLEAK_STATIC_DATA
+.ENDIF
+
 SLOFILES= \
     $(SLO)$/cpp2uno.obj		\
     $(SLO)$/uno2cpp.obj		\