diff options
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/Executable/complex.cxx | 9 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/complex.cxx | 9 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/complex.cxx | 9 |
3 files changed, 15 insertions, 12 deletions
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index 67459d6..e07845c 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -15,6 +15,7 @@ extern "C" { #include "cmSystemTools.h" #include "cmOrderLinkDirectories.h" #include "cmGeneratedFileStream.h" +#include <cmsys/DynamicLoader.hxx> #else #include <vector> #include <string> @@ -327,7 +328,7 @@ int main() lib += cmDynamicLoader::LibPrefix(); lib += "CMakeTestModule"; lib += cmDynamicLoader::LibExtension(); - cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); + cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { std::string err = "Can not open CMakeTestModule:\n"; @@ -336,11 +337,11 @@ int main() } else { - cmDynamicLoaderFunction fun = - cmDynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); + cmsys::DynamicLoader::SymbolPointer fun = + cmsys::DynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); if(!fun) { - fun = cmDynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); + fun = cmsys::DynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); } typedef int (*TEST_FUNCTION)(); TEST_FUNCTION testFun = (TEST_FUNCTION)fun; diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 67459d6..e07845c 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -15,6 +15,7 @@ extern "C" { #include "cmSystemTools.h" #include "cmOrderLinkDirectories.h" #include "cmGeneratedFileStream.h" +#include <cmsys/DynamicLoader.hxx> #else #include <vector> #include <string> @@ -327,7 +328,7 @@ int main() lib += cmDynamicLoader::LibPrefix(); lib += "CMakeTestModule"; lib += cmDynamicLoader::LibExtension(); - cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); + cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { std::string err = "Can not open CMakeTestModule:\n"; @@ -336,11 +337,11 @@ int main() } else { - cmDynamicLoaderFunction fun = - cmDynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); + cmsys::DynamicLoader::SymbolPointer fun = + cmsys::DynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); if(!fun) { - fun = cmDynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); + fun = cmsys::DynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); } typedef int (*TEST_FUNCTION)(); TEST_FUNCTION testFun = (TEST_FUNCTION)fun; diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index 67459d6..e07845c 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -15,6 +15,7 @@ extern "C" { #include "cmSystemTools.h" #include "cmOrderLinkDirectories.h" #include "cmGeneratedFileStream.h" +#include <cmsys/DynamicLoader.hxx> #else #include <vector> #include <string> @@ -327,7 +328,7 @@ int main() lib += cmDynamicLoader::LibPrefix(); lib += "CMakeTestModule"; lib += cmDynamicLoader::LibExtension(); - cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); + cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { std::string err = "Can not open CMakeTestModule:\n"; @@ -336,11 +337,11 @@ int main() } else { - cmDynamicLoaderFunction fun = - cmDynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); + cmsys::DynamicLoader::SymbolPointer fun = + cmsys::DynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); if(!fun) { - fun = cmDynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); + fun = cmsys::DynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); } typedef int (*TEST_FUNCTION)(); TEST_FUNCTION testFun = (TEST_FUNCTION)fun; |