[openrtm-commit:01462] r2568 - trunk/OpenRTM-aist/src/lib/coil/common
openrtm @ openrtm.org
openrtm @ openrtm.org
2014年 6月 27日 (金) 20:49:04 JST
Author: n-ando
Date: 2014-06-27 20:49:04 +0900 (Fri, 27 Jun 2014)
New Revision: 2568
Modified:
trunk/OpenRTM-aist/src/lib/coil/common/Properties.cpp
Log:
[compat,bugfix, ->RELENG_1_1] Bug of skipping empty line of conf file has been fixed.
Modified: trunk/OpenRTM-aist/src/lib/coil/common/Properties.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2014-06-12 15:13:12 UTC (rev 2567)
+++ trunk/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2014-06-27 11:49:04 UTC (rev 2568)
@@ -346,7 +346,8 @@
coil::eraseHeadBlank(tmp);
// Skip comments or empty lines
- if (tmp[0] == '#' || tmp[0] == '!' || tmp == "") continue;
+ if (tmp.empty()) { continue; }
+ if (tmp[0] == '#' || tmp[0] == '!') { continue; }
// line-end '\' continues entry
if (tmp[tmp.size() - 1] == '\\' && !coil::isEscaped(tmp, tmp.size() - 1))
@@ -358,7 +359,7 @@
pline += tmp;
// Skip empty line (made of only ' ' or '\t')
- if (pline == "") continue;
+ if (pline.empty()) { continue; }
std::string key, value;
splitKeyValue(pline, key, value);
More information about the openrtm-commit
mailing list