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

Fixed merge conflicts.

This commit is contained in:
Gunnar Beutner 2012-06-04 09:21:33 +02:00
parent 99e5eef7c1
commit 9c3e57c858
4 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/configfile/configfile.vcxproj
View File

@ -11,20 +11,11 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="configcontext.cpp" />
<ClCompile Include="configfilecomponent.cpp" />
<ClCompile Include="icinga_lexer.cc" />
<ClCompile Include="icinga_parser.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="configcontext.h" />
<ClInclude Include="configfilecomponent.h" />
<ClInclude Include="i2-configfile.h" />
<ClInclude Include="icinga_parser.h" />
</ItemGroup>
<ItemGroup>
<None Include="icinga_lexer.ll" />
<None Include="icinga_parser.yy" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{E58F1DA7-B723-412B-B2B7-7FF58E2A944E}</ProjectGuid>

2
dyn/configcontext.h
View File

@ -23,7 +23,7 @@
namespace icinga
{
class ConfigContext
class I2_DYN_API ConfigContext
{
public:
ConfigContext(istream *input = &cin);

35
dyn/configobject.h Normal file
View File

@ -0,0 +1,35 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#ifndef CONFIGOBJECT_H
#define CONFIGOBJECT_H
namespace icinga
{
class I2_DYN_API ConfigObject : public Object
{
public:
private:
DynamicObject::WeakPtr m_DynamicObject;
};
}
#endif /* CONFIGOBJECT_H */

21
dyn/dyn.vcxproj
View File

@ -11,6 +11,8 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="configcontext.h" />
<ClInclude Include="config_parser.h" />
<ClInclude Include="dynamicdictionary.h" />
<ClInclude Include="dynamicobject.h" />
<ClInclude Include="i2-dyn.h" />
@ -18,11 +20,30 @@
<ClInclude Include="objectset.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="configcontext.cpp" />
<ClCompile Include="config_lexer.cc" />
<ClCompile Include="config_parser.cc" />
<ClCompile Include="dynamicdictionary.cpp" />
<ClCompile Include="dynamicobject.cpp" />
<ClCompile Include="objectmap.cpp" />
<ClCompile Include="objectset.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="config_lexer.ll">
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">config_lexer.cc</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">config_lexer.cc</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">win_flex "%(FullPath)"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">win_flex "%(FullPath)"</Command>
<FileType>Document</FileType>
</None>
<None Include="config_parser.yy">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">win_bison -d "%(FullPath)"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">config_parser.cc config_parser.h</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">win_bison -d "%(FullPath)"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">config_parser.cc config_parser.h</Outputs>
<FileType>Document</FileType>
</None>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}</ProjectGuid>
<Keyword>Win32Proj</Keyword>