diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-25 13:34:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-25 13:34:29 (GMT) |
| commit | 6052e4b3bfe62a8d29ca679affb101c7aec0d219 (patch) | |
| tree | db207f809276b9c5691c889b9e658befc93e6d4c /Source/cmVisualStudioWCEPlatformParser.cxx | |
| parent | 9ebc2092885fa32eaa47aade965fcec2cfa308d0 (diff) | |
| parent | 5784747d1b0404a0c1cb0223b15b823476023fba (diff) | |
| download | CMake-6052e4b3bfe62a8d29ca679affb101c7aec0d219.zip CMake-6052e4b3bfe62a8d29ca679affb101c7aec0d219.tar.gz CMake-6052e4b3bfe62a8d29ca679affb101c7aec0d219.tar.bz2 | |
Merge topic 'improve-character-find-and-replace'
5784747d Improve string find: prefer character overloads.
5cec953e Use std::replace for replacing chars in strings.
2a1a2033 cmExtraEclipseCDT4Generator: use std::replace.
34bc6e1f cmCTestScriptHandler: don't call find repeatedly.
Diffstat (limited to 'Source/cmVisualStudioWCEPlatformParser.cxx')
| -rw-r--r-- | Source/cmVisualStudioWCEPlatformParser.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmVisualStudioWCEPlatformParser.cxx b/Source/cmVisualStudioWCEPlatformParser.cxx index 4f5e7c0..bc6b0bf 100644 --- a/Source/cmVisualStudioWCEPlatformParser.cxx +++ b/Source/cmVisualStudioWCEPlatformParser.cxx @@ -141,8 +141,8 @@ std::string cmVisualStudioWCEPlatformParser::FixPaths( cmSystemTools::ReplaceString(ret, "$(PATH)", "%PATH%"); cmSystemTools::ReplaceString(ret, "$(VCInstallDir)", VcInstallDir.c_str()); cmSystemTools::ReplaceString(ret, "$(VSInstallDir)", VsInstallDir.c_str()); - cmSystemTools::ReplaceString(ret, "\\", "/"); + std::replace(ret.begin(), ret.end(), '\\', '/'); cmSystemTools::ReplaceString(ret, "//", "/"); - cmSystemTools::ReplaceString(ret, "/", "\\"); + std::replace(ret.begin(), ret.end(), '/', '\\'); return ret; } |