From fcf9632822440fad1588dc076e734496591f18ab Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Wed, 7 May 2003 19:29:13 +0000 Subject: Makefile. Makefile.am * configure.in * config/ac_dll.m4 * examples/cppunittest/Makefile.am * examples/hierarchy/Makefile.am * examples/money/Makefile.am * examples/simple/Makefile.am * include/cppunit/config/SelectDllLoader.h * include/cppunit/plugin/TestPlugIn.h * include/cppunit/tools/Algorithm.h * src/DllPlugInTester/Makefile.am * src/cppunit/Makefile.am * src/cppunit/TestDecorator.cpp * src/cppunit/ShlDynamicLibraryManager.cpp * src/cppunit/UnixDynamicLibraryManager.cpp * src/cppunit/Win32DynamicLibraryManager.cpp: applied patch from Abdessattar Sassi to add support for plug-in to hp-ux (patch #721546). --- src/cppunit/ShlDynamicLibraryManager.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/cppunit/ShlDynamicLibraryManager.cpp') diff --git a/src/cppunit/ShlDynamicLibraryManager.cpp b/src/cppunit/ShlDynamicLibraryManager.cpp index a9849e9..9f4be22 100644 --- a/src/cppunit/ShlDynamicLibraryManager.cpp +++ b/src/cppunit/ShlDynamicLibraryManager.cpp @@ -14,7 +14,6 @@ DynamicLibraryManager::LibraryHandle DynamicLibraryManager::doLoadLibrary( const std::string &libraryName ) { return ::shl_load(libraryName.c_str(), BIND_IMMEDIATE, 0L); - //return ::dlopen( libraryName.c_str(), RTLD_NOW ); // RTLD_LAZY ? } @@ -22,7 +21,6 @@ void DynamicLibraryManager::doReleaseLibrary() { ::shl_unload( (shl_t)m_libraryHandle); - //::dlclose( m_libraryHandle); } @@ -30,12 +28,15 @@ DynamicLibraryManager::Symbol DynamicLibraryManager::doFindSymbol( const std::string &symbol ) { DynamicLibraryManager::Symbol L_symaddr = 0; - if ( ::shl_findsym ( (shl_t*)(&m_libraryHandle), symbol.c_str(), TYPE_UNDEFINED, &L_symaddr ) == 0 ) { + if ( ::shl_findsym( (shl_t*)(&m_libraryHandle), + symbol.c_str(), + TYPE_UNDEFINED, + &L_symaddr ) == 0 ) + { return L_symaddr; - } else { - return 0; - } - //return ::dlsym ( m_libraryHandle, symbol.c_str() ); + } + + return 0; } -- cgit v1.2.1