Merge with develop

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

View file

@ -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