diff options
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 2 | ||||
| -rw-r--r-- | cppu/util/target.pmk | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index c248af3228e5..3cf9abe0934e 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -275,7 +275,6 @@ inline void TypeDescriptor_Init_Impl::callChain( //__________________________________________________________________________________________________ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) { -#ifndef CPPU_LEAK_STATIC_DATA if( pCache ) { TypeDescriptionList_Impl::const_iterator aIt = pCache->begin(); @@ -355,7 +354,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) #endif delete pCallbacks; pCallbacks = 0; -#endif // CPPU_LEAK_STATIC_DATA if( pMutex ) { diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk index 70be64b8e3f4..3befcb154753 100644 --- a/cppu/util/target.pmk +++ b/cppu/util/target.pmk @@ -45,16 +45,9 @@ CFLAGS += -O .ELSE -.IF "$(COM)" == "MSC" # msvc++: no inlining +.IF "$(COM)" == "MSC" CFLAGS += -Ob0 -.IF "$(cppu_no_leak)" == "" -.IF "$(bndchk)" == "" -# msvc++: workaround for strange crash at exit: just don't do the -# cleanup of types and whatnot... -CFLAGS += -DCPPU_LEAK_STATIC_DATA -.ENDIF -.ENDIF .ENDIF .ENDIF |