summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Solodovnikov <hellyeahdominate@gmail.com>2017-05-24 19:51:46 (GMT)
committerPavel Solodovnikov <hellyeahdominate@gmail.com>2017-05-24 20:30:57 (GMT)
commit76bdb4076277cda0e68e1d80cdf715020eab5a7a (patch)
tree0e1b2dc8b24e857dba27c1d77c114e3985a18b23
parent43d9b296f5688b865bc2c40ea0af3b042047dfe8 (diff)
downloadCMake-76bdb4076277cda0e68e1d80cdf715020eab5a7a.zip
CMake-76bdb4076277cda0e68e1d80cdf715020eab5a7a.tar.gz
CMake-76bdb4076277cda0e68e1d80cdf715020eab5a7a.tar.bz2
Change std::basic_string<char> to std::string
-rw-r--r--Source/cmSystemTools.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 8978e18..9f9cc6f 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -348,12 +348,12 @@ bool cmSystemTools::IsInternallyOn(const char* val)
if (!val) {
return false;
}
- std::basic_string<char> v = val;
+ std::string v = val;
if (v.size() > 4) {
return false;
}
- for (std::basic_string<char>::iterator c = v.begin(); c != v.end(); c++) {
+ for (std::string::iterator c = v.begin(); c != v.end(); c++) {
*c = static_cast<char>(toupper(*c));
}
return v == "I_ON";
@@ -368,7 +368,7 @@ bool cmSystemTools::IsOn(const char* val)
if (len > 4) {
return false;
}
- std::basic_string<char> v(val, len);
+ std::string v(val, len);
static std::set<std::string> onValues;
if (onValues.empty()) {
@@ -378,7 +378,7 @@ bool cmSystemTools::IsOn(const char* val)
onValues.insert("TRUE");
onValues.insert("Y");
}
- for (std::basic_string<char>::iterator c = v.begin(); c != v.end(); c++) {
+ for (std::string::iterator c = v.begin(); c != v.end(); c++) {
*c = static_cast<char>(toupper(*c));
}
return (onValues.count(v) > 0);
@@ -413,8 +413,8 @@ bool cmSystemTools::IsOff(const char* val)
offValues.insert("IGNORE");
}
// Try and avoid toupper().
- std::basic_string<char> v(val, len);
- for (std::basic_string<char>::iterator c = v.begin(); c != v.end(); c++) {
+ std::string v(val, len);
+ for (std::string::iterator c = v.begin(); c != v.end(); c++) {
*c = static_cast<char>(toupper(*c));
}
return (offValues.count(v) > 0);