diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-16 16:01:05 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-16 16:01:05 (GMT) |
| commit | f483e48d2a2f3361dcf3c60096bbfe9975f90ddf (patch) | |
| tree | 2909a53a3efb79bf633ba0be2fa93d7c7b68181f /Source/kwsys/testDynamicLoader.cxx | |
| parent | 4102949bf95eee1ce88544fafdf80439aece85b2 (diff) | |
| download | CMake-f483e48d2a2f3361dcf3c60096bbfe9975f90ddf.zip CMake-f483e48d2a2f3361dcf3c60096bbfe9975f90ddf.tar.gz CMake-f483e48d2a2f3361dcf3c60096bbfe9975f90ddf.tar.bz2 | |
ENH: Cleanup DynamicLoader so that the symbols have more consistent names, start using dynamic loader from kwsys in CMake
Diffstat (limited to 'Source/kwsys/testDynamicLoader.cxx')
| -rw-r--r-- | Source/kwsys/testDynamicLoader.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx index efd84d6..444f6d9 100644 --- a/Source/kwsys/testDynamicLoader.cxx +++ b/Source/kwsys/testDynamicLoader.cxx @@ -53,7 +53,8 @@ kwsys_stl::string GetLibName(const char* lname) int TestDynamicLoader(const char* libname, const char* symbol, int r1, int r2, int r3) { kwsys_ios::cerr << "Testing: " << libname << kwsys_ios::endl; - kwsys::LibHandle l = kwsys::DynamicLoader::OpenLibrary(libname); + kwsys::DynamicLoader::LibraryHandle l + = kwsys::DynamicLoader::OpenLibrary(libname); // If result is incompatible with expectation just fails (xor): if( (r1 && !l) || (!r1 && l) ) { @@ -61,7 +62,8 @@ int TestDynamicLoader(const char* libname, const char* symbol, int r1, int r2, i << kwsys::DynamicLoader::LastError() << kwsys_ios::endl; return 1; } - kwsys::DynamicLoaderFunction f = kwsys::DynamicLoader::GetSymbolAddress(l, symbol); + kwsys::DynamicLoader::SymbolPointer f + = kwsys::DynamicLoader::GetSymbolAddress(l, symbol); if( (r2 && !f) || (!r2 && f) ) { kwsys_ios::cerr @@ -104,8 +106,8 @@ int main(int argc, char *argv[]) // Now try on the generated library kwsys_stl::string libname = GetLibName("testDynload"); res += TestDynamicLoader(libname.c_str(), "dummy",1,0,1); - res += TestDynamicLoader(libname.c_str(), "TestDynamicLoaderFunction",1,1,1); - res += TestDynamicLoader(libname.c_str(), "_TestDynamicLoaderFunction",1,0,1); + res += TestDynamicLoader(libname.c_str(), "TestDynamicLoaderSymbolPointer",1,1,1); + res += TestDynamicLoader(libname.c_str(), "_TestDynamicLoaderSymbolPointer",1,0,1); res += TestDynamicLoader(libname.c_str(), "TestDynamicLoaderData",1,1,1); res += TestDynamicLoader(libname.c_str(), "_TestDynamicLoaderData",1,0,1); |