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

Implement the 'base' field for the Type class 

fixes #9921
This commit is contained in:
Gunnar Beutner 2015-08-17 07:59:44 +02:00
parent 071d2f18fb
commit a546a67934
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/base/type.cpp
View File

@ -71,7 +71,7 @@ Object::Ptr Type::Instantiate(void) const
ObjectFactory factory = GetFactory(); ObjectFactory factory = GetFactory();
if (!factory) if (!factory)
return Object::Ptr(); BOOST_THROW_EXCEPTION(std::runtime_error("Type does not have a factory function."));
return factory(); return factory();
} }
@ -115,6 +115,8 @@ Value Type::GetField(int id) const
{ {
if (id == 0) if (id == 0)
return GetPrototype(); return GetPrototype();
else if (id == 1)
return GetBaseType();
return Object::GetField(id); return Object::GetField(id);
} }
@ -148,6 +150,8 @@ int TypeType::GetFieldId(const String& name) const
{ {
if (name == "prototype") if (name == "prototype")
return 0; return 0;
else if (name == "base")
return 1;
return -1; return -1;
} }
@ -156,13 +160,15 @@ Field TypeType::GetFieldInfo(int id) const
{ {
if (id == 0) if (id == 0)
return Field(0, "Object", "prototype", NULL, 0); return Field(0, "Object", "prototype", NULL, 0);
else if (id == 1)
return Field(1, "Object", "base", NULL, 0);
throw std::runtime_error("Invalid field ID."); throw std::runtime_error("Invalid field ID.");
} }
int TypeType::GetFieldCount(void) const int TypeType::GetFieldCount(void) const
{ {
return 1; return 2;
} }
ObjectFactory TypeType::GetFactory(void) const ObjectFactory TypeType::GetFactory(void) const