summaryrefslogtreecommitdiffstats
path: root/Source/cmIfCommand.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-03-10 23:04:11 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-03-11 14:03:50 (GMT)
commit21c573f682f9eafbc8d4402f7febbb1bec1cb86a (patch)
tree8c9e0b913c7de5737a770430064ff5533a19477d /Source/cmIfCommand.cxx
parente21ffaf8fe5499426604b4ebb9cd08798ee6107c (diff)
downloadCMake-21c573f682f9eafbc8d4402f7febbb1bec1cb86a.zip
CMake-21c573f682f9eafbc8d4402f7febbb1bec1cb86a.tar.gz
CMake-21c573f682f9eafbc8d4402f7febbb1bec1cb86a.tar.bz2
Remove some c_str() calls.
Use the clang RemoveCStrCalls tool to automatically migrate the code. This was only run on linux, so does not have any positive or negative effect on other platforms.
Diffstat (limited to 'Source/cmIfCommand.cxx')
-rw-r--r--Source/cmIfCommand.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index bd12327..06c4b89 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -26,7 +26,7 @@ static std::string cmIfCommandError(
i != args.end(); ++i)
{
err += " ";
- err += lg->EscapeForCMake(i->c_str());
+ err += lg->EscapeForCMake(*i);
}
err += "\n";
return err;
@@ -199,7 +199,7 @@ bool cmIfCommand
err += errorString;
if (status == cmake::FATAL_ERROR)
{
- this->SetError(err.c_str());
+ this->SetError(err);
cmSystemTools::SetFatalErrorOccured();
return false;
}
@@ -261,7 +261,7 @@ namespace
}
// Check definition.
- const char* def = mf->GetDefinition(arg.c_str());
+ const char* def = mf->GetDefinition(arg);
return !cmSystemTools::IsOff(def);
}
@@ -277,12 +277,12 @@ namespace
else if(arg == "1")
{ return true; }
else
- { return !cmSystemTools::IsOff(mf->GetDefinition(arg.c_str())); }
+ { return !cmSystemTools::IsOff(mf->GetDefinition(arg)); }
}
else
{
// Old GetVariableOrNumber behavior.
- const char* def = mf->GetDefinition(arg.c_str());
+ const char* def = mf->GetDefinition(arg);
if(!def && atoi(arg.c_str()))
{
def = arg.c_str();
@@ -559,7 +559,7 @@ namespace
}
else
{
- bdef = makefile->IsDefinitionSet((argP1)->c_str());
+ bdef = makefile->IsDefinitionSet(*(argP1));
}
HandlePredicate(bdef, reducible, arg, newArgs, argP1, argP2);
}