This commit is contained in:
Hieu Hoang 2013-07-18 17:00:44 +01:00
parent f81d7a446f
commit cb46bd3c00
7 changed files with 25 additions and 26 deletions

View File

@ -558,8 +558,7 @@ bool StaticData::LoadData(Parameter *parameter)
if (m_parameter->GetParam("placeholder-factor").size() > 0) { if (m_parameter->GetParam("placeholder-factor").size() > 0) {
m_placeHolderFactor = Scan<FactorType>(m_parameter->GetParam("placeholder-factor")[0]); m_placeHolderFactor = Scan<FactorType>(m_parameter->GetParam("placeholder-factor")[0]);
} } else {
else {
m_placeHolderFactor = NOT_FOUND; m_placeHolderFactor = NOT_FOUND;
} }

View File

@ -770,8 +770,9 @@ public:
void OverrideFeatures(); void OverrideFeatures();
FactorType GetPlaceholderFactor() const FactorType GetPlaceholderFactor() const {
{ return m_placeHolderFactor; } return m_placeHolderFactor;
}
}; };
} }

View File

@ -246,8 +246,7 @@ inline std::vector<std::string> TokenizeFirstOnly(const std::string& str,
// Found a token, add it to the vector. // Found a token, add it to the vector.
tokens.push_back(str.substr(0, pos)); tokens.push_back(str.substr(0, pos));
tokens.push_back(str.substr(pos + 1, str.size() - pos - 1)); tokens.push_back(str.substr(pos + 1, str.size() - pos - 1));
} } else {
else {
tokens.push_back(str); tokens.push_back(str);
} }