From ee269f4f16300b0427c1e1baef94b85ccc4ea13f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 18 Feb 2015 00:40:54 +0100 Subject: cmMakefile: Replace two loops with std::replace. --- Source/cmMakefile.cxx | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2085a97..0d0c60a 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1341,19 +1341,8 @@ void cmMakefile::AddDefineFlag(const char* flag, std::string& dflags) { // remove any \n\r std::string ret = flag; - std::string::size_type pos = 0; - while((pos = ret.find('\n', pos)) != std::string::npos) - { - ret[pos] = ' '; - pos++; - } - pos = 0; - while((pos = ret.find('\r', pos)) != std::string::npos) - { - ret[pos] = ' '; - pos++; - } - + std::replace(ret.begin(), ret.end(), '\n', ' '); + std::replace(ret.begin(), ret.end(), '\r', ' '); dflags += " "; dflags += ret; } -- cgit v0.12