Merge with develop

This commit is contained in:
kervala 2016-01-30 18:16:16 +01:00
parent 2962e88e7f
commit 3324471931

View file

@ -423,7 +423,7 @@ inline
std::string CStateInstance::getStrNelVar(std::string const& varId) std::string CStateInstance::getStrNelVar(std::string const& varId)
{ {
TStrNelVarList::iterator it = _StrNelVar.find(varId); TStrNelVarList::iterator it = _StrNelVar.find(varId);
if (it!=_StrNelVar.end()) return it->second->get(); if (it != _StrNelVar.end()) return it->second->get();
if (NLMISC::CVariable<float>::exists(varId)) if (NLMISC::CVariable<float>::exists(varId))
{ {
@ -431,8 +431,8 @@ std::string CStateInstance::getStrNelVar(std::string const& varId)
return ""; return "";
} }
_StrNelVar[varId] = new NLMISC::CVariable<std::string>("StateInstanceVar", varId.c_str(), "", std::string()); _StrNelVar[varId] = new NLMISC::CVariable<std::string>("StateInstanceStrVar", varId.c_str(), "", std::string());
return _NelVar[varId]->get(); return _StrNelVar[varId]->get();
} }
inline inline