diff options
author | Brad King <brad.king@kitware.com> | 2018-06-22 15:31:36 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-06-22 15:31:36 (GMT) |
commit | f2d97c1cdf06f8575d0b23130db4ffa725ca5161 (patch) | |
tree | 8a8d5eeac45a9afc304573af316c63ebb6eccd6b /Source/kwsys/SystemTools.hxx.in | |
parent | 44ca3d922cc1da390eaea3673a025a9b96556afc (diff) | |
parent | 6d7fdedde6c41e6d5e7840a7d653d490296aa6e7 (diff) | |
download | CMake-f2d97c1cdf06f8575d0b23130db4ffa725ca5161.zip CMake-f2d97c1cdf06f8575d0b23130db4ffa725ca5161.tar.gz CMake-f2d97c1cdf06f8575d0b23130db4ffa725ca5161.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-06-22 (49068d94)
Diffstat (limited to 'Source/kwsys/SystemTools.hxx.in')
-rw-r--r-- | Source/kwsys/SystemTools.hxx.in | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/kwsys/SystemTools.hxx.in b/Source/kwsys/SystemTools.hxx.in index 928ee41..8d1f78c 100644 --- a/Source/kwsys/SystemTools.hxx.in +++ b/Source/kwsys/SystemTools.hxx.in @@ -10,8 +10,6 @@ #include <string> #include <vector> -#include <@KWSYS_NAMESPACE@/String.hxx> - #include <sys/types.h> // include sys/stat.h after sys/types.h #include <sys/stat.h> @@ -197,9 +195,9 @@ public: s starts with a / then the first element of the returned array will be /, so /foo/bar will be [/, foo, bar] */ - static std::vector<String> SplitString(const std::string& s, - char separator = '/', - bool isPath = false); + static std::vector<std::string> SplitString(const std::string& s, + char separator = '/', + bool isPath = false); /** * Perform a case-independent string comparison */ |