mirror of https://github.com/Icinga/icinga2.git
Bugfixes for libdyn.
This commit is contained in:
parent
1726e1ba0d
commit
6c3b2a1348
|
@ -23,7 +23,7 @@
|
|||
namespace icinga
|
||||
{
|
||||
|
||||
class ConfigVM
|
||||
class I2_DYN_API ConfigVM
|
||||
{
|
||||
public:
|
||||
static void ExecuteItems(const vector<ConfigItem::Ptr>& items);
|
||||
|
|
|
@ -11,20 +11,27 @@
|
|||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="configcontext.h" />
|
||||
<ClInclude Include="configcompiler.h" />
|
||||
<ClInclude Include="configitem.h" />
|
||||
<ClInclude Include="configvm.h" />
|
||||
<ClInclude Include="config_parser.h" />
|
||||
<ClInclude Include="dynamicdictionary.h" />
|
||||
<ClInclude Include="debuginfo.h" />
|
||||
<ClInclude Include="dynamicobject.h" />
|
||||
<ClInclude Include="expression.h" />
|
||||
<ClInclude Include="expressionlist.h" />
|
||||
<ClInclude Include="i2-dyn.h" />
|
||||
<ClInclude Include="objectmap.h" />
|
||||
<ClInclude Include="objectset.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="configcontext.cpp" />
|
||||
<ClCompile Include="configcompiler.cpp" />
|
||||
<ClCompile Include="configitem.cpp" />
|
||||
<ClCompile Include="configvm.cpp" />
|
||||
<ClCompile Include="config_lexer.cc" />
|
||||
<ClCompile Include="config_parser.cc" />
|
||||
<ClCompile Include="dynamicdictionary.cpp" />
|
||||
<ClCompile Include="dynamicobject.cpp" />
|
||||
<ClCompile Include="expression.cpp" />
|
||||
<ClCompile Include="expressionlist.cpp" />
|
||||
<ClCompile Include="objectmap.cpp" />
|
||||
<ClCompile Include="objectset.cpp" />
|
||||
</ItemGroup>
|
||||
|
|
|
@ -36,8 +36,11 @@ Dictionary::Ptr DynamicObject::GetConfig(void) const
|
|||
return m_Config;
|
||||
}
|
||||
|
||||
Dictionary::Ptr DynamicObject::GetTags(void) const
|
||||
Dictionary::Ptr DynamicObject::GetTags(void)
|
||||
{
|
||||
if (!m_Tags)
|
||||
m_Tags = make_shared<Dictionary>();
|
||||
|
||||
return m_Tags;
|
||||
}
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ public:
|
|||
void SetConfig(Dictionary::Ptr config);
|
||||
Dictionary::Ptr GetConfig(void) const;
|
||||
|
||||
Dictionary::Ptr GetTags(void) const;
|
||||
Dictionary::Ptr GetTags(void);
|
||||
|
||||
string GetType(void) const;
|
||||
string GetName(void) const;
|
||||
|
|
|
@ -124,7 +124,7 @@ public:
|
|||
private:
|
||||
set<TValue> m_Objects;
|
||||
|
||||
ObjectSet::Ptr m_Parent;
|
||||
typename ObjectSet<TValue>::Ptr m_Parent;
|
||||
function<bool (const TValue&)> m_Predicate;
|
||||
|
||||
int ObjectAddedOrCommittedHandler(const ObjectSetEventArgs<TValue>& ea)
|
||||
|
|
Loading…
Reference in New Issue