diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-02 14:23:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-02 14:23:17 (GMT) |
| commit | c5cc3441b379e2bc6e70efd6dbd530edebbf0024 (patch) | |
| tree | de0c2a39648c936039b7c86886cbe49c04b92923 /Source/kwsys/DynamicLoader.hxx.in | |
| parent | 72c11e590273d100c49f472afc3a7569b233ff00 (diff) | |
| parent | 1b79433a6d7cdd1da1a0af74240f2299c78e4112 (diff) | |
| download | CMake-c5cc3441b379e2bc6e70efd6dbd530edebbf0024.zip CMake-c5cc3441b379e2bc6e70efd6dbd530edebbf0024.tar.gz CMake-c5cc3441b379e2bc6e70efd6dbd530edebbf0024.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/DynamicLoader.hxx.in')
| -rw-r--r-- | Source/kwsys/DynamicLoader.hxx.in | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Source/kwsys/DynamicLoader.hxx.in b/Source/kwsys/DynamicLoader.hxx.in index 75811ab..1e4a912 100644 --- a/Source/kwsys/DynamicLoader.hxx.in +++ b/Source/kwsys/DynamicLoader.hxx.in @@ -12,8 +12,8 @@ #ifndef @KWSYS_NAMESPACE@_DynamicLoader_hxx #define @KWSYS_NAMESPACE@_DynamicLoader_hxx -#include <@KWSYS_NAMESPACE@/Configure.h> -#include <@KWSYS_NAMESPACE@/stl/string> +#include <@KWSYS_NAMESPACE@/Configure.hxx> +#include <string> #if defined(__hpux) #include <dl.h> @@ -28,11 +28,6 @@ #include <be/kernel/image.h> #endif -/* Define these macros temporarily to keep the code readable. */ -#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS -# define kwsys_stl @KWSYS_NAMESPACE@_stl -#endif - namespace @KWSYS_NAMESPACE@ { /** \class DynamicLoader @@ -83,14 +78,14 @@ public: /** Load a dynamic library into the current process. * The returned LibraryHandle can be used to access the symbols in the * library. */ - static LibraryHandle OpenLibrary(const kwsys_stl::string&); + static LibraryHandle OpenLibrary(const std::string&); /** Attempt to detach a dynamic library from the * process. A value of true is returned if it is sucessful. */ static int CloseLibrary(LibraryHandle); /** Find the address of the symbol in the given library. */ - static SymbolPointer GetSymbolAddress(LibraryHandle, const kwsys_stl::string&); + static SymbolPointer GetSymbolAddress(LibraryHandle, const std::string&); /** Return the default module prefix for the current platform. */ static const char* LibPrefix() { return "@KWSYS_DynamicLoader_PREFIX@"; } @@ -104,9 +99,4 @@ public: } // namespace @KWSYS_NAMESPACE@ -/* Undefine temporary macros. */ -#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS -# undef kwsys_stl -#endif - #endif |