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

Bugfixes for libdyn.

This commit is contained in:
Gunnar Beutner 2012-06-11 14:04:16 +02:00
parent 1726e1ba0d
commit 6c3b2a1348
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dyn/configvm.h
View File

@ -23,7 +23,7 @@
namespace icinga namespace icinga
{ {
class ConfigVM class I2_DYN_API ConfigVM
{ {
public: public:
static void ExecuteItems(const vector<ConfigItem::Ptr>& items); static void ExecuteItems(const vector<ConfigItem::Ptr>& items);

15
dyn/dyn.vcxproj
View File

@ -11,20 +11,27 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<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="config_parser.h" />
<ClInclude Include="dynamicdictionary.h" /> <ClInclude Include="debuginfo.h" />
<ClInclude Include="dynamicobject.h" /> <ClInclude Include="dynamicobject.h" />
<ClInclude Include="expression.h" />
<ClInclude Include="expressionlist.h" />
<ClInclude Include="i2-dyn.h" /> <ClInclude Include="i2-dyn.h" />
<ClInclude Include="objectmap.h" /> <ClInclude Include="objectmap.h" />
<ClInclude Include="objectset.h" /> <ClInclude Include="objectset.h" />
</ItemGroup> </ItemGroup>
<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_lexer.cc" />
<ClCompile Include="config_parser.cc" /> <ClCompile Include="config_parser.cc" />
<ClCompile Include="dynamicdictionary.cpp" />
<ClCompile Include="dynamicobject.cpp" /> <ClCompile Include="dynamicobject.cpp" />
<ClCompile Include="expression.cpp" />
<ClCompile Include="expressionlist.cpp" />
<ClCompile Include="objectmap.cpp" /> <ClCompile Include="objectmap.cpp" />
<ClCompile Include="objectset.cpp" /> <ClCompile Include="objectset.cpp" />
</ItemGroup> </ItemGroup>

5
dyn/dynamicobject.cpp
View File

@ -36,8 +36,11 @@ Dictionary::Ptr DynamicObject::GetConfig(void) const
return m_Config; 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; return m_Tags;
} }

2
dyn/dynamicobject.h
View File

@ -36,7 +36,7 @@ public:
void SetConfig(Dictionary::Ptr config); void SetConfig(Dictionary::Ptr config);
Dictionary::Ptr GetConfig(void) const; Dictionary::Ptr GetConfig(void) const;
Dictionary::Ptr GetTags(void) const; Dictionary::Ptr GetTags(void);
string GetType(void) const; string GetType(void) const;
string GetName(void) const; string GetName(void) const;

2
dyn/objectset.h
View File

@ -124,7 +124,7 @@ public:
private: private:
set<TValue> m_Objects; set<TValue> m_Objects;
ObjectSet::Ptr m_Parent; typename ObjectSet<TValue>::Ptr m_Parent;
function<bool (const TValue&)> m_Predicate; function<bool (const TValue&)> m_Predicate;
int ObjectAddedOrCommittedHandler(const ObjectSetEventArgs<TValue>& ea) int ObjectAddedOrCommittedHandler(const ObjectSetEventArgs<TValue>& ea)