diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-25 11:54:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-25 11:54:34 (GMT) |
| commit | aff019f7a453e8bbb67f004d3164151305d0d23e (patch) | |
| tree | f7e00ccad85d75d8595f3fd47e666ed50656c655 /Source/kwsys/SystemTools.cxx | |
| parent | a1c6d7e9af5a241b1afa29b3f7459ee9ee4ec77a (diff) | |
| parent | 780d9e070bec694c12a10162d64196073c6d2ba2 (diff) | |
| download | CMake-aff019f7a453e8bbb67f004d3164151305d0d23e.zip CMake-aff019f7a453e8bbb67f004d3164151305d0d23e.tar.gz CMake-aff019f7a453e8bbb67f004d3164151305d0d23e.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-07-25 (a24a6acb)
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index ae7a18a..36f24c7 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -3403,11 +3403,7 @@ static void SystemToolsAppendComponents( out_components.emplace_back(std::move(*i)); } } else if (!i->empty() && *i != cur) { -#if __cplusplus >= 201103L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L) - out_components.push_back(std::move(*i)); -#else - out_components.push_back(*i); -#endif + out_components.emplace_back(std::move(*i)); } } } @@ -4743,7 +4739,7 @@ void SystemTools::ClassInitialize() // Test progressively shorter logical-to-physical mappings. std::string cwd_str = cwd; std::string pwd_path; - Realpath(pwd_str.c_str(), pwd_path); + Realpath(pwd_str, pwd_path); while (cwd_str == pwd_path && cwd_str != pwd_str) { // The current pair of paths is a working logical mapping. cwd_changed = cwd_str; @@ -4753,7 +4749,7 @@ void SystemTools::ClassInitialize() // mapping still works. pwd_str = SystemTools::GetFilenamePath(pwd_str); cwd_str = SystemTools::GetFilenamePath(cwd_str); - Realpath(pwd_str.c_str(), pwd_path); + Realpath(pwd_str, pwd_path); } // Add the translation to keep the logical path name. |