tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix for GCC 

refs #9839
This commit is contained in:
Gunnar Beutner 2016-03-29 14:42:32 +02:00
parent 5dd685cef9
commit 112f024810
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/serializer.cpp
View File

@ -120,7 +120,7 @@ static Object::Ptr DeserializeObject(const Object::Ptr& object, const Dictionary
if (object) if (object)
instance = object; instance = object;
else else
instance = type->Instantiate(); instance = type->Instantiate(std::vector<Value>());
ObjectLock olock(input); ObjectLock olock(input);
BOOST_FOREACH(const Dictionary::Pair& kv, input) { BOOST_FOREACH(const Dictionary::Pair& kv, input) {

2
lib/base/type.hpp
View File

@ -86,7 +86,7 @@ public:
String GetPluralName(void) const; String GetPluralName(void) const;
Object::Ptr Instantiate(const std::vector<Value>& args = std::vector<Value>()) const; Object::Ptr Instantiate(const std::vector<Value>& args) const;
bool IsAssignableFrom(const Type::Ptr& other) const; bool IsAssignableFrom(const Type::Ptr& other) const;

2
lib/cli/repositoryutility.cpp
View File

@ -233,7 +233,7 @@ bool RepositoryUtility::AddObject(const std::vector<String>& object_paths, const
if (check_config) { if (check_config) {
try { try {
ConfigObject::Ptr object = static_pointer_cast<ConfigObject>(utype->Instantiate()); ConfigObject::Ptr object = static_pointer_cast<ConfigObject>(utype->Instantiate(std::vector<Value>()));
/* temporarly set the object type for validation */ /* temporarly set the object type for validation */
attrs->Set("type", utype->GetName()); attrs->Set("type", utype->GetName());
Deserialize(object, attrs, false, FAConfig); Deserialize(object, attrs, false, FAConfig);

2
lib/config/configitem.cpp
View File

@ -173,7 +173,7 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
if (IsAbstract()) if (IsAbstract())
return ConfigObject::Ptr(); return ConfigObject::Ptr();
ConfigObject::Ptr dobj = static_pointer_cast<ConfigObject>(type->Instantiate()); ConfigObject::Ptr dobj = static_pointer_cast<ConfigObject>(type->Instantiate(std::vector<Value>()));
dobj->SetDebugInfo(m_DebugInfo); dobj->SetDebugInfo(m_DebugInfo);
dobj->SetZoneName(m_Zone); dobj->SetZoneName(m_Zone);

2
test/base-type.cpp
View File

@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(instantiate)
{ {
Type::Ptr t = Type::GetByName("PerfdataValue"); Type::Ptr t = Type::GetByName("PerfdataValue");
Object::Ptr p = t->Instantiate(); Object::Ptr p = t->Instantiate(std::vector<Value>());
BOOST_CHECK(p); BOOST_CHECK(p);
} }