diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2015-08-28 18:50:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-02 14:23:14 (GMT) |
| commit | 1b79433a6d7cdd1da1a0af74240f2299c78e4112 (patch) | |
| tree | 7d6ca208083a5f740d8631d973facf6ebdf2e1b7 /Directory.hxx.in | |
| parent | ca96be228345d93f51cb4edbd0428b709f529b84 (diff) | |
| download | CMake-1b79433a6d7cdd1da1a0af74240f2299c78e4112.zip CMake-1b79433a6d7cdd1da1a0af74240f2299c78e4112.tar.gz CMake-1b79433a6d7cdd1da1a0af74240f2299c78e4112.tar.bz2 | |
KWSys 2015-08-28 (dc3fdd7f)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ dc3fdd7f | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' cdaf522c..dc3fdd7f
Brad King (9):
15a16826 Remove include <kwsys/ios/*> and kwsys_ios:: compatibility layer
a5799c17 Remove unused KWSYS_IOS_USE_{SSTREAM,STRSTREAM_H,STRSTREA_H} checks
198957cf Remove unused KWSYS_IOS_USE_SSTREAM check
24d2b60e Remove support for pre-C++98 streams
2a581c30 Remove support for pre-C++98 std::string missing operators
5f3fd465 Remove support for pre-C++98 STL
cded1574 Remove support for pre-C++98 STL from hash_map and hash_set
f130a3ab Remove kwsys/cstddef compatibility header
dc3fdd7f Remove support for pre-C++98 template capabilities
Diffstat (limited to 'Directory.hxx.in')
| -rw-r--r-- | Directory.hxx.in | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Directory.hxx.in b/Directory.hxx.in index 1bcf90e..e68f337 100644 --- a/Directory.hxx.in +++ b/Directory.hxx.in @@ -13,12 +13,7 @@ #define @KWSYS_NAMESPACE@_Directory_hxx #include <@KWSYS_NAMESPACE@/Configure.h> -#include <@KWSYS_NAMESPACE@/stl/string> - -/* 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 +#include <string> namespace @KWSYS_NAMESPACE@ { @@ -44,7 +39,7 @@ public: * in that directory. 0 is returned if the directory can not be * opened, 1 if it is opened. */ - bool Load(const kwsys_stl::string&); + bool Load(const std::string&); /** * Return the number of files in the current directory. @@ -55,7 +50,7 @@ public: * Return the number of files in the specified directory. * A higher performance static method. */ - static unsigned long GetNumberOfFilesInDirectory(const kwsys_stl::string&); + static unsigned long GetNumberOfFilesInDirectory(const std::string&); /** * Return the file at the given index, the indexing is 0 based @@ -83,9 +78,4 @@ private: } // namespace @KWSYS_NAMESPACE@ -/* Undefine temporary macros. */ -#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS -# undef kwsys_stl -#endif - #endif |