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/String.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/String.hxx.in')
| -rw-r--r-- | Source/kwsys/String.hxx.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/kwsys/String.hxx.in b/Source/kwsys/String.hxx.in index 4386c9e..2e9aedb 100644 --- a/Source/kwsys/String.hxx.in +++ b/Source/kwsys/String.hxx.in @@ -12,7 +12,7 @@ #ifndef @KWSYS_NAMESPACE@_String_hxx #define @KWSYS_NAMESPACE@_String_hxx -#include <@KWSYS_NAMESPACE@/stl/string> +#include <string> namespace @KWSYS_NAMESPACE@ { @@ -25,10 +25,10 @@ namespace @KWSYS_NAMESPACE@ * simply a subclass of this type with the same interface so that the * name is shorter in debugging symbols and error messages. */ -class String: public @KWSYS_NAMESPACE@_stl::string +class String: public std::string { /** The original string type. */ - typedef @KWSYS_NAMESPACE@_stl::string stl_string; + typedef std::string stl_string; public: @@ -55,8 +55,8 @@ public: #if defined(__WATCOMC__) inline bool operator<(String const& l, String const& r) { - return (static_cast<@KWSYS_NAMESPACE@_stl::string const&>(l) < - static_cast<@KWSYS_NAMESPACE@_stl::string const&>(r)); + return (static_cast<std::string const&>(l) < + static_cast<std::string const&>(r)); } #endif |