diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2014-08-04 12:59:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-08-04 14:16:30 (GMT) |
| commit | 158c6d1cffe863fde284d4e5eeeb8129d40ce0e9 (patch) | |
| tree | cfcd285d4d397ad9570f5ee25d3139b89cfa190c /Directory.hxx.in | |
| parent | d4d1b7f7d1d6592f12a6692dfb8068aa495bd454 (diff) | |
| download | CMake-158c6d1cffe863fde284d4e5eeeb8129d40ce0e9.zip CMake-158c6d1cffe863fde284d4e5eeeb8129d40ce0e9.tar.gz CMake-158c6d1cffe863fde284d4e5eeeb8129d40ce0e9.tar.bz2 | |
KWSys 2014-08-04 (e787837a)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ e787837a | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 65b36ede..e787837a
Ben Boeckel (4):
9927862c SystemTools: more string replacements
b3d598b0 strings: remove unnecessary c_str calls
ffe94132 SystemTools: use char instead of const char*
f29fec7c Directory: accept strings in methods
Rashad M (1):
e787837a SharedForward: Cast away const to call execvp on MinGW 64-bit
Change-Id: I96437b332971670cfcd953717c5563e9ba0f2b99
Diffstat (limited to 'Directory.hxx.in')
| -rw-r--r-- | Directory.hxx.in | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Directory.hxx.in b/Directory.hxx.in index 05217c4..0acb191 100644 --- a/Directory.hxx.in +++ b/Directory.hxx.in @@ -13,6 +13,13 @@ #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 +# define kwsys_ios @KWSYS_NAMESPACE@_ios +#endif namespace @KWSYS_NAMESPACE@ { @@ -38,7 +45,7 @@ public: * in that directory. 0 is returned if the directory can not be * opened, 1 if it is opened. */ - bool Load(const char*); + bool Load(const kwsys_stl::string&); /** * Return the number of files in the current directory. @@ -49,7 +56,7 @@ public: * Return the number of files in the specified directory. * A higher performance static method. */ - static unsigned long GetNumberOfFilesInDirectory(const char*); + static unsigned long GetNumberOfFilesInDirectory(const kwsys_stl::string&); /** * Return the file at the given index, the indexing is 0 based @@ -77,4 +84,10 @@ private: } // namespace @KWSYS_NAMESPACE@ +/* Undefine temporary macros. */ +#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS +# undef kwsys_stl +# undef kwsys_ios +#endif + #endif |