From ef3bfa016c03a4881861d7829fdfdc0006448a8e Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Sat, 8 Feb 2014 02:59:56 -0500
Subject: [PATCH] c_str: Don't use .c_str() when streaming strings
It's not needed and just clutters the code.
Change-Id: I9e69621be79b8bfebe6790edae4cdb86e8389733
---
CommandLineArguments.cxx | 4 ++--
SystemTools.cxx | 2 +-
testCommandLineArguments.cxx | 2 +-
testCommandLineArguments1.cxx | 4 ++--
testSystemTools.cxx | 8 ++++----
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/CommandLineArguments.cxx b/CommandLineArguments.cxx
index ece88ae8..9efe56d7 100644
--- a/CommandLineArguments.cxx
+++ b/CommandLineArguments.cxx
@@ -235,7 +235,7 @@ int CommandLineArguments::Parse()
return 0;
}
CommandLineArguments_DEBUG("This is a space argument: " << arg
- << " value: " << this->Internals->Argv[cc+1].c_str());
+ << " value: " << this->Internals->Argv[cc+1]);
// Value is the next argument
if ( !this->PopulateVariable(cs, this->Internals->Argv[cc+1].c_str()) )
{
@@ -313,7 +313,7 @@ int CommandLineArguments::Parse()
}
else
{
- kwsys_ios::cerr << "Got unknown argument: \"" << arg.c_str() << "\"" << kwsys_ios::endl;
+ kwsys_ios::cerr << "Got unknown argument: \"" << arg << "\"" << kwsys_ios::endl;
this->Internals->LastArgument --;
return 0;
}
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 32e79e62..f7e35c5e 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -3041,7 +3041,7 @@ bool SystemTools::FindProgramPath(const char* argv0,
kwsys_stl::vector<kwsys_stl::string>::iterator i;
for(i=failures.begin(); i != failures.end(); ++i)
{
- msg << " \"" << i->c_str() << "\"\n";
+ msg << " \"" << *i << "\"\n";
}
errorMsg = msg.str();
return false;
diff --git a/testCommandLineArguments.cxx b/testCommandLineArguments.cxx
index 72e65447..6a03c0f7 100644
--- a/testCommandLineArguments.cxx
+++ b/testCommandLineArguments.cxx
@@ -171,7 +171,7 @@ int testCommandLineArguments(int argc, char* argv[])
CompareTwoLists(strings_argument, valid_strings, 4);
CompareTwoLists(stl_strings_argument, valid_stl_strings, 4);
- kwsys_ios::cout << "Some STL String variable was set to: " << some_stl_string_variable.c_str() << kwsys_ios::endl;
+ kwsys_ios::cout << "Some STL String variable was set to: " << some_stl_string_variable << kwsys_ios::endl;
kwsys_ios::cout << "Some bool variable was set to: " << some_bool_variable << kwsys_ios::endl;
kwsys_ios::cout << "Some bool variable was set to: " << some_bool_variable1 << kwsys_ios::endl;
kwsys_ios::cout << "bool_arg1 variable was set to: " << bool_arg1 << kwsys_ios::endl;
diff --git a/testCommandLineArguments1.cxx b/testCommandLineArguments1.cxx
index 0860c2ab..3b84c38c 100644
--- a/testCommandLineArguments1.cxx
+++ b/testCommandLineArguments1.cxx
@@ -57,12 +57,12 @@ int testCommandLineArguments1(int argc, char* argv[])
}
if ( p != "1" )
{
- kwsys_ios::cout << "Problem setting P. Value of P: " << p.c_str() << kwsys_ios::endl;
+ kwsys_ios::cout << "Problem setting P. Value of P: " << p << kwsys_ios::endl;
res = 1;
}
kwsys_ios::cout << "Value of N: " << n << kwsys_ios::endl;
kwsys_ios::cout << "Value of M: " << m << kwsys_ios::endl;
- kwsys_ios::cout << "Value of P: " << p.c_str() << kwsys_ios::endl;
+ kwsys_ios::cout << "Value of P: " << p << kwsys_ios::endl;
if ( m )
{
delete [] m;
diff --git a/testSystemTools.cxx b/testSystemTools.cxx
index 1690fd51..69825a8c 100644
--- a/testSystemTools.cxx
+++ b/testSystemTools.cxx
@@ -60,8 +60,8 @@ static bool CheckConvertToUnixSlashes(kwsys_stl::string input,
if ( result != output )
{
kwsys_ios::cerr
- << "Problem with ConvertToUnixSlashes - input: " << input.c_str()
- << " output: " << result.c_str() << " expected: " << output.c_str()
+ << "Problem with ConvertToUnixSlashes - input: " << input
+ << " output: " << result << " expected: " << output
<< kwsys_ios::endl;
return false;
}
@@ -86,8 +86,8 @@ static bool CheckEscapeChars(kwsys_stl::string input,
if (result != output)
{
kwsys_ios::cerr
- << "Problem with CheckEscapeChars - input: " << input.c_str()
- << " output: " << result.c_str() << " expected: " << output.c_str()
+ << "Problem with CheckEscapeChars - input: " << input
+ << " output: " << result << " expected: " << output
<< kwsys_ios::endl;
return false;
}
--
GitLab