diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 12:58:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-25 13:00:14 (GMT) |
| commit | c18fc30d1a0c67780fdea4ccd0a84a601ad7e8ef (patch) | |
| tree | a57fafb6cf3f198ec82e8b8197b2f2051f3193ec /Source/cmSystemTools.cxx | |
| parent | 9f84cbd8c323a5a59b666a8bc8199e52a181bb35 (diff) | |
| parent | 9e5c13738bdc45b00b529b492bad92800890fb9c (diff) | |
| download | CMake-c18fc30d1a0c67780fdea4ccd0a84a601ad7e8ef.zip CMake-c18fc30d1a0c67780fdea4ccd0a84a601ad7e8ef.tar.gz CMake-c18fc30d1a0c67780fdea4ccd0a84a601ad7e8ef.tar.bz2 | |
Merge topic 'renamefile-string'
9e5c13738b cmSystemTools::RenameFile: Accepts std::string args
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2842
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 2d98a7d..a16460f 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1035,7 +1035,8 @@ void cmSystemTools::InitializeLibUV() #endif } -bool cmSystemTools::RenameFile(const char* oldname, const char* newname) +bool cmSystemTools::RenameFile(const std::string& oldname, + const std::string& newname) { #ifdef _WIN32 # ifndef INVALID_FILE_ATTRIBUTES @@ -1073,7 +1074,7 @@ bool cmSystemTools::RenameFile(const char* oldname, const char* newname) return retry.Count > 0; #else /* On UNIX we have an OS-provided call to do this atomically. */ - return rename(oldname, newname) == 0; + return rename(oldname.c_str(), newname.c_str()) == 0; #endif } |