diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-05-28 08:49:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-05-28 08:55:10 +0200 |
| commit | bf2e8fadd8b861e9606ab24dcd7e253d8daedd3f (patch) | |
| tree | 5466dd2c08419288306210d611b6046c29682f49 /sal | |
| parent | f64d2df599ccff28be963e5b2cc3b5dde65e721f (diff) | |
dlclose confuses LeakSanitizer
...so just do not bother unloading the protector libs again
Change-Id: I33caa7beaac3b5e6c4a4836061def24fc5372b70
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/cppunittester/cppunittester.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index b42bf3a4d7ce..0c5a2a1a4f40 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -48,7 +48,6 @@ #include "cppunit/portability/Stream.h" #include "boost/noncopyable.hpp" -#include "boost/ptr_container/ptr_vector.hpp" #include <boost/scoped_array.hpp> #include "boost/static_assert.hpp" @@ -273,7 +272,6 @@ SAL_IMPLEMENT_MAIN() { #endif #endif - boost::ptr_vector<osl::Module> modules; std::vector<CppUnit::Protector *> protectors; CppUnit::TestResult result; std::string args; @@ -303,8 +301,9 @@ SAL_IMPLEMENT_MAIN() { rtl::OUString lib(getArgument(index + 1)); rtl::OUString sym(getArgument(index + 2)); #ifndef DISABLE_DYNLOADING - modules.push_back(new osl::Module(lib, SAL_LOADMODULE_GLOBAL)); - oslGenericFunction fn = modules.back().getFunctionSymbol(sym); + osl::Module mod(lib, SAL_LOADMODULE_GLOBAL); + oslGenericFunction fn = mod.getFunctionSymbol(sym); + mod.release(); #else oslGenericFunction fn = 0; if (sym == "unoexceptionprotector") |