diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-12 16:21:07 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-12 16:21:07 +0100 |
| commit | f12505d5962153abc805e7c2fefbea8acca0d465 (patch) | |
| tree | 5ab33de3a0faa80e18a2aeb4610e8296b563d634 | |
| parent | Merge remote branch 'origin/libreoffice-3-3' (diff) | |
| download | core-f12505d5962153abc805e7c2fefbea8acca0d465.tar.gz core-f12505d5962153abc805e7c2fefbea8acca0d465.zip | |
Revert "Add workaround to avoid crash when exiting LibreOffice"
This reverts commit 146e2fbca20f5cba3410d3d042ae6222a565dd7e.
The workaround is has to be present in libreoffice-3-3, but we do not want to
have it in master, so that eventually it is fixed in the end :-)
| -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 |