Windows build fix.

diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj
index 8d8d6047fb61786ec11467cdadedcf4a5feb0ab1..5f93d8de0791962b4fe0e12aa6436763e0f2bd2a 100644 (file)
--- a/components/checker/checker.vcxproj
+++ b/components/checker/checker.vcxproj
@@ -102,7 +102,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +117,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,7 +136,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -155,7 +155,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/components/cluster/cluster.vcxproj b/components/cluster/cluster.vcxproj
index fcf55e5d2b5097ee2b70cf765854eb28bdeb3e48..4b1da3c51b2ed9724647a922f8c54dedb45941b5 100644 (file)
--- a/components/cluster/cluster.vcxproj
+++ b/components/cluster/cluster.vcxproj
@@ -18,8 +18,40 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="cluster-type.cpp" />
+    <ClCompile Include="clustercomponent.cpp" />
+    <ClCompile Include="endpoint.cpp" />
+    <ClCompile Include="jsonrpc.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="clustercomponent.h" />
+    <ClInclude Include="endpoint.h" />
+    <ClInclude Include="jsonrpc.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="cluster-type.conf">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Preparing config fragment for embedding</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Preparing config fragment for embedding</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Preparing config fragment for embedding</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Preparing config fragment for embedding</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+    </CustomBuild>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2E6C1133-730F-4875-A72C-B455B1DD4C5C}</ProjectGuid>
+    <ProjectGuid>{8732E0CD-E3D0-41F2-A538-94884543890F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>demo</RootNamespace>
   </PropertyGroup>
@@ -102,7 +134,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +149,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,7 +168,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -155,38 +187,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="democomponent.h" />
-    <ClInclude Include="i2-demo.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="demo-type.cpp" />
-    <ClCompile Include="democomponent.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="demo-type.conf">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Preparing config fragment for embedding</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-    </CustomBuild>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/components/cluster/cluster.vcxproj.filters b/components/cluster/cluster.vcxproj.filters
index 922435a5279187f400ac03cec35982b2c482fbd1..1738de41b2d91cc29c68cf1a7d07ab3dc215edf9 100644 (file)
--- a/components/cluster/cluster.vcxproj.filters
+++ b/components/cluster/cluster.vcxproj.filters
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="democomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="i2-demo.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="Headerdateien">
       <UniqueIdentifier>{11a495bf-a705-4766-b3d3-9b5db266a6ef}</UniqueIdentifier>
@@ -17,15 +9,32 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="democomponent.cpp">
+    <ClCompile Include="clustercomponent.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="endpoint.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="jsonrpc.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="demo-type.cpp">
+    <ClCompile Include="cluster-type.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="demo-type.conf">
+    <ClInclude Include="clustercomponent.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="jsonrpc.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="endpoint.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="cluster-type.conf">
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>

diff --git a/components/cluster/clustercomponent.cpp b/components/cluster/clustercomponent.cpp
index b4821bb0d8525850d4bea8e2a8340c6cbb3a9deb..2f595f9d247bebf6016fdfbbc55a4e8738e7f07e 100644 (file)
--- a/components/cluster/clustercomponent.cpp
+++ b/components/cluster/clustercomponent.cpp
@@ -52,23 +52,23 @@ void ClusterComponent::Start(void)
        m_ClusterTimer->SetInterval(5);
        m_ClusterTimer->Start();
 
-       Service::OnNewCheckResult.connect(bind(&ClusterComponent::CheckResultHandler, this, _1, _2, _3));
-       Service::OnNextCheckChanged.connect(bind(&ClusterComponent::NextCheckChangedHandler, this, _1, _2, _3));
-       Notification::OnNextNotificationChanged.connect(bind(&ClusterComponent::NextNotificationChangedHandler, this, _1, _2, _3));
-       Service::OnForceNextCheckChanged.connect(bind(&ClusterComponent::ForceNextCheckChangedHandler, this, _1, _2, _3));
-       Service::OnForceNextNotificationChanged.connect(bind(&ClusterComponent::ForceNextNotificationChangedHandler, this, _1, _2, _3));
-       Service::OnEnableActiveChecksChanged.connect(bind(&ClusterComponent::EnableActiveChecksChangedHandler, this, _1, _2, _3));
-       Service::OnEnablePassiveChecksChanged.connect(bind(&ClusterComponent::EnablePassiveChecksChangedHandler, this, _1, _2, _3));
-       Service::OnEnableNotificationsChanged.connect(bind(&ClusterComponent::EnableNotificationsChangedHandler, this, _1, _2, _3));
-       Service::OnEnableFlappingChanged.connect(bind(&ClusterComponent::EnableFlappingChangedHandler, this, _1, _2, _3));
-       Service::OnCommentAdded.connect(bind(&ClusterComponent::CommentAddedHandler, this, _1, _2, _3));
-       Service::OnCommentRemoved.connect(bind(&ClusterComponent::CommentRemovedHandler, this, _1, _2, _3));
-       Service::OnDowntimeAdded.connect(bind(&ClusterComponent::DowntimeAddedHandler, this, _1, _2, _3));
-       Service::OnDowntimeRemoved.connect(bind(&ClusterComponent::DowntimeRemovedHandler, this, _1, _2, _3));
-       Service::OnAcknowledgementSet.connect(bind(&ClusterComponent::AcknowledgementSetHandler, this, _1, _2, _3, _4, _5, _6));
-       Service::OnAcknowledgementCleared.connect(bind(&ClusterComponent::AcknowledgementClearedHandler, this, _1, _2));
-
-       Endpoint::OnMessageReceived.connect(bind(&ClusterComponent::MessageHandler, this, _1, _2));
+       Service::OnNewCheckResult.connect(boost::bind(&ClusterComponent::CheckResultHandler, this, _1, _2, _3));
+       Service::OnNextCheckChanged.connect(boost::bind(&ClusterComponent::NextCheckChangedHandler, this, _1, _2, _3));
+       Notification::OnNextNotificationChanged.connect(boost::bind(&ClusterComponent::NextNotificationChangedHandler, this, _1, _2, _3));
+       Service::OnForceNextCheckChanged.connect(boost::bind(&ClusterComponent::ForceNextCheckChangedHandler, this, _1, _2, _3));
+       Service::OnForceNextNotificationChanged.connect(boost::bind(&ClusterComponent::ForceNextNotificationChangedHandler, this, _1, _2, _3));
+       Service::OnEnableActiveChecksChanged.connect(boost::bind(&ClusterComponent::EnableActiveChecksChangedHandler, this, _1, _2, _3));
+       Service::OnEnablePassiveChecksChanged.connect(boost::bind(&ClusterComponent::EnablePassiveChecksChangedHandler, this, _1, _2, _3));
+       Service::OnEnableNotificationsChanged.connect(boost::bind(&ClusterComponent::EnableNotificationsChangedHandler, this, _1, _2, _3));
+       Service::OnEnableFlappingChanged.connect(boost::bind(&ClusterComponent::EnableFlappingChangedHandler, this, _1, _2, _3));
+       Service::OnCommentAdded.connect(boost::bind(&ClusterComponent::CommentAddedHandler, this, _1, _2, _3));
+       Service::OnCommentRemoved.connect(boost::bind(&ClusterComponent::CommentRemovedHandler, this, _1, _2, _3));
+       Service::OnDowntimeAdded.connect(boost::bind(&ClusterComponent::DowntimeAddedHandler, this, _1, _2, _3));
+       Service::OnDowntimeRemoved.connect(boost::bind(&ClusterComponent::DowntimeRemovedHandler, this, _1, _2, _3));
+       Service::OnAcknowledgementSet.connect(boost::bind(&ClusterComponent::AcknowledgementSetHandler, this, _1, _2, _3, _4, _5, _6));
+       Service::OnAcknowledgementCleared.connect(boost::bind(&ClusterComponent::AcknowledgementClearedHandler, this, _1, _2));
+
+       Endpoint::OnMessageReceived.connect(boost::bind(&ClusterComponent::MessageHandler, this, _1, _2));
 }
 
 /**
@@ -164,7 +164,7 @@ void ClusterComponent::ListenerThreadProc(const Socket::Ptr& server)
        for (;;) {
                Socket::Ptr client = server->Accept();
 
-               Utility::QueueAsyncCallback(bind(&ClusterComponent::NewClientHandler, this, client, TlsRoleServer));
+               Utility::QueueAsyncCallback(boost::bind(&ClusterComponent::NewClientHandler, this, client, TlsRoleServer));
        }
 }
 
@@ -187,7 +187,7 @@ void ClusterComponent::AddConnection(const String& node, const String& service)
        TcpSocket::Ptr client = boost::make_shared<TcpSocket>();
 
        client->Connect(node, service);
-       Utility::QueueAsyncCallback(bind(&ClusterComponent::NewClientHandler, this, client, TlsRoleClient));
+       Utility::QueueAsyncCallback(boost::bind(&ClusterComponent::NewClientHandler, this, client, TlsRoleClient));
 }
 
 /**

diff --git a/components/cluster/endpoint.cpp b/components/cluster/endpoint.cpp
index 5dee9254de2dfdf9bfdc280ec59922c955f11d09..261c4b8af5fba43183759d21bceb4e89c4e5e463 100644 (file)
--- a/components/cluster/endpoint.cpp
+++ b/components/cluster/endpoint.cpp
@@ -98,7 +98,7 @@ void Endpoint::MessageThreadProc(const Stream::Ptr& stream)
                        return;
                }
 
-               Utility::QueueAsyncCallback(bind(boost::ref(Endpoint::OnMessageReceived), GetSelf(), message));
+               Utility::QueueAsyncCallback(boost::bind(boost::ref(Endpoint::OnMessageReceived), GetSelf(), message));
        }
 }
 

diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj
index fbe716008cda42f57c0294c32392cdb7e5b28160..c782d0275e1e32d4a3fcfde3ff9f06f3b32e9c99 100644 (file)
--- a/components/compat/compat.vcxproj
+++ b/components/compat/compat.vcxproj
@@ -102,7 +102,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +117,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -135,7 +135,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -153,7 +153,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj
index fcf55e5d2b5097ee2b70cf765854eb28bdeb3e48..167f0ccd7fe4ac1001f2115684e24958186f25c8 100644 (file)
--- a/components/demo/demo.vcxproj
+++ b/components/demo/demo.vcxproj
@@ -102,7 +102,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +117,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,7 +136,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -155,7 +155,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/components/livestatus/livestatus.vcxproj b/components/livestatus/livestatus.vcxproj
index 5d75190fe610ccf6a515f492e0bd0e39226db926..fcb009c30a4937478fc8102dcbcc09d424d4fcd7 100644 (file)
--- a/components/livestatus/livestatus.vcxproj
+++ b/components/livestatus/livestatus.vcxproj
@@ -191,7 +191,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -206,7 +206,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -225,7 +225,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -244,7 +244,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/components/notification/notification.vcxproj b/components/notification/notification.vcxproj
index 8a33fb61b7169a0749252f95a7f4a7f030381f38..d21f7cbab7bef411a8c65f383c44afb2cf17573e 100644 (file)
--- a/components/notification/notification.vcxproj
+++ b/components/notification/notification.vcxproj
@@ -102,7 +102,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +117,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,7 +136,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -155,7 +155,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/components/notification/notificationcomponent.cpp b/components/notification/notificationcomponent.cpp
index ac1ebe08f1af71bc001509ef6c17f6c6af0f9d22..220e99d6a67d1508a2230b23baec688b39a84dcc 100644 (file)
--- a/components/notification/notificationcomponent.cpp
+++ b/components/notification/notificationcomponent.cpp
@@ -38,7 +38,7 @@ void NotificationComponent::Start(void)
 {
        DynamicObject::Start();
 
-       Service::OnNotificationsRequested.connect(bind(&NotificationComponent::SendNotificationsHandler, this, _1,
+       Service::OnNotificationsRequested.connect(boost::bind(&NotificationComponent::SendNotificationsHandler, this, _1,
            _2, _3, _4, _5));
 
        m_NotificationTimer = boost::make_shared<Timer>();

diff --git a/icinga2.sln b/icinga2.sln
index 899738f25e9f83ac28bd3da1f72ac55caedfa713..c0199d279dba97b210c361847c117fc8c3043d7e 100644 (file)
--- a/icinga2.sln
+++ b/icinga2.sln
@@ -7,9 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga-app", "icinga-app\ic
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E} = {EBEA7D10-66FB-4760-8AA8-81CD500D899E}
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C} = {2E6C1133-730F-4875-A72C-B455B1DD4C5C}
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F} = {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}
-               {17C93245-8C20-4316-9573-1AE41D918C10} = {17C93245-8C20-4316-9573-1AE41D918C10}
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} = {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}
                {38CE81CC-2660-4EF0-A936-4A337591DA3E} = {38CE81CC-2660-4EF0-A936-4A337591DA3E}
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
        EndProjectSection
@@ -42,22 +39,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checker", "components\check
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "delegation", "components\delegation\delegation.vcxproj", "{17C93245-8C20-4316-9573-1AE41D918C10}"
-       ProjectSection(ProjectDependencies) = postProject
-               {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311}
-               {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
-               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}
-               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replication", "components\replication\replication.vcxproj", "{704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}"
-       ProjectSection(ProjectDependencies) = postProject
-               {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311}
-               {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
-               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}
-               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compat", "components\compat\compat.vcxproj", "{2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}"
        ProjectSection(ProjectDependencies) = postProject
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311}
@@ -85,14 +66,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "lib\config\config
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga", "lib\icinga\icinga.vcxproj", "{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}"
-       ProjectSection(ProjectDependencies) = postProject
-               {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311}
-               {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
-               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remoting", "lib\remoting\remoting.vcxproj", "{8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}"
        ProjectSection(ProjectDependencies) = postProject
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311}
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
@@ -114,142 +87,207 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "livestatus", "components\li
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkembedconfig", "tools\mkembedconfig\mkembedconfig.vcxproj", "{D5EE8062-8FC5-40E8-81C0-B435B06AB311}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cluster", "components\cluster\cluster.vcxproj", "{8732E0CD-E3D0-41F2-A538-94884543890F}"
+       ProjectSection(ProjectDependencies) = postProject
+               {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311}
+               {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
+               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ido", "lib\ido\ido.vcxproj", "{87BBCE4C-36F5-4C04-90FB-9B74618AF988}"
+       ProjectSection(ProjectDependencies) = postProject
+               {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
+               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                Debug|Win64 = Debug|Win64
+               Debug|x64 = Debug|x64
                Release|Win32 = Release|Win32
                Release|Win64 = Release|Win64
+               Release|x64 = Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win32.ActiveCfg = Debug|Win32
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win32.Build.0 = Debug|Win32
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win64.ActiveCfg = Debug|x64
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win64.Build.0 = Debug|x64
+               {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|x64.ActiveCfg = Debug|x64
+               {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|x64.Build.0 = Debug|x64
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.ActiveCfg = Release|Win32
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.Build.0 = Release|Win32
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win64.ActiveCfg = Release|x64
                {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win64.Build.0 = Release|x64
+               {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|x64.ActiveCfg = Release|x64
+               {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|x64.Build.0 = Release|x64
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win32.ActiveCfg = Debug|Win32
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win32.Build.0 = Debug|Win32
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win64.ActiveCfg = Debug|x64
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win64.Build.0 = Debug|x64
+               {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|x64.ActiveCfg = Debug|x64
+               {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|x64.Build.0 = Debug|x64
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win32.ActiveCfg = Release|Win32
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win32.Build.0 = Release|Win32
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win64.ActiveCfg = Release|x64
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win64.Build.0 = Release|x64
+               {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|x64.ActiveCfg = Release|x64
+               {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|x64.Build.0 = Release|x64
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Debug|Win32.ActiveCfg = Debug|Win32
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Debug|Win32.Build.0 = Debug|Win32
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Debug|Win64.ActiveCfg = Debug|x64
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Debug|Win64.Build.0 = Debug|x64
+               {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Debug|x64.ActiveCfg = Debug|x64
+               {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Debug|x64.Build.0 = Debug|x64
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Release|Win32.ActiveCfg = Release|Win32
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Release|Win32.Build.0 = Release|Win32
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Release|Win64.ActiveCfg = Release|x64
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Release|Win64.Build.0 = Release|x64
+               {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Release|x64.ActiveCfg = Release|x64
+               {EBEA7D10-66FB-4760-8AA8-81CD500D899E}.Release|x64.Build.0 = Release|x64
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.ActiveCfg = Debug|Win32
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.Build.0 = Debug|Win32
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win64.ActiveCfg = Debug|x64
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win64.Build.0 = Debug|x64
+               {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|x64.ActiveCfg = Debug|x64
+               {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|x64.Build.0 = Debug|x64
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.ActiveCfg = Release|Win32
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.Build.0 = Release|Win32
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win64.ActiveCfg = Release|x64
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win64.Build.0 = Release|x64
+               {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|x64.ActiveCfg = Release|x64
+               {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|x64.Build.0 = Release|x64
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win32.ActiveCfg = Debug|Win32
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win32.Build.0 = Debug|Win32
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win64.ActiveCfg = Debug|x64
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win64.Build.0 = Debug|x64
+               {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|x64.ActiveCfg = Debug|x64
+               {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|x64.Build.0 = Debug|x64
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win32.ActiveCfg = Release|Win32
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win32.Build.0 = Release|Win32
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win64.ActiveCfg = Release|x64
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win64.Build.0 = Release|x64
+               {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|x64.ActiveCfg = Release|x64
+               {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|x64.Build.0 = Release|x64
                {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win32.ActiveCfg = Debug|Win32
                {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win32.Build.0 = Debug|Win32
                {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win64.ActiveCfg = Debug|x64
                {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win64.Build.0 = Debug|x64
+               {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|x64.ActiveCfg = Debug|x64
+               {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|x64.Build.0 = Debug|x64
                {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win32.ActiveCfg = Release|Win32
                {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win32.Build.0 = Release|Win32
                {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win64.ActiveCfg = Release|x64
                {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win64.Build.0 = Release|x64
-               {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win32.ActiveCfg = Debug|Win32
-               {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win32.Build.0 = Debug|Win32
-               {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win64.ActiveCfg = Debug|x64
-               {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win64.Build.0 = Debug|x64
-               {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win32.ActiveCfg = Release|Win32
-               {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win32.Build.0 = Release|Win32
-               {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win64.ActiveCfg = Release|x64
-               {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win64.Build.0 = Release|x64
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win32.ActiveCfg = Debug|Win32
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win32.Build.0 = Debug|Win32
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win64.ActiveCfg = Debug|x64
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win64.Build.0 = Debug|x64
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win32.ActiveCfg = Release|Win32
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win32.Build.0 = Release|Win32
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win64.ActiveCfg = Release|x64
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win64.Build.0 = Release|x64
+               {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|x64.ActiveCfg = Release|x64
+               {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|x64.Build.0 = Release|x64
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win32.ActiveCfg = Debug|Win32
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win32.Build.0 = Debug|Win32
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win64.ActiveCfg = Debug|x64
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win64.Build.0 = Debug|x64
+               {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|x64.ActiveCfg = Debug|x64
+               {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|x64.Build.0 = Debug|x64
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.ActiveCfg = Release|Win32
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.Build.0 = Release|Win32
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win64.ActiveCfg = Release|x64
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win64.Build.0 = Release|x64
+               {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|x64.ActiveCfg = Release|x64
+               {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|x64.Build.0 = Release|x64
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.ActiveCfg = Debug|Win32
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.Build.0 = Debug|Win32
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win64.ActiveCfg = Debug|x64
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win64.Build.0 = Debug|x64
+               {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|x64.ActiveCfg = Debug|x64
+               {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|x64.Build.0 = Debug|x64
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.ActiveCfg = Release|Win32
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.Build.0 = Release|Win32
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win64.ActiveCfg = Release|x64
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win64.Build.0 = Release|x64
+               {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|x64.ActiveCfg = Release|x64
+               {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|x64.Build.0 = Release|x64
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win32.ActiveCfg = Debug|Win32
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win32.Build.0 = Debug|Win32
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win64.ActiveCfg = Debug|x64
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win64.Build.0 = Debug|x64
+               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|x64.ActiveCfg = Debug|x64
+               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|x64.Build.0 = Debug|x64
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win32.ActiveCfg = Release|Win32
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win32.Build.0 = Release|Win32
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win64.ActiveCfg = Release|x64
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win64.Build.0 = Release|x64
+               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|x64.ActiveCfg = Release|x64
+               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|x64.Build.0 = Release|x64
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win32.ActiveCfg = Debug|Win32
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win32.Build.0 = Debug|Win32
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win64.ActiveCfg = Debug|x64
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win64.Build.0 = Debug|x64
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|x64.ActiveCfg = Debug|x64
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|x64.Build.0 = Debug|x64
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.ActiveCfg = Release|Win32
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.Build.0 = Release|Win32
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win64.ActiveCfg = Release|x64
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win64.Build.0 = Release|x64
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.ActiveCfg = Debug|Win32
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.Build.0 = Debug|Win32
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win64.ActiveCfg = Debug|x64
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win64.Build.0 = Debug|x64
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.ActiveCfg = Release|Win32
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.Build.0 = Release|Win32
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win64.ActiveCfg = Release|x64
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win64.Build.0 = Release|x64
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|x64.ActiveCfg = Release|x64
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|x64.Build.0 = Release|x64
                {5163C576-6AA1-4769-8396-9639C45BE124}.Debug|Win32.ActiveCfg = Debug|Win32
                {5163C576-6AA1-4769-8396-9639C45BE124}.Debug|Win32.Build.0 = Debug|Win32
                {5163C576-6AA1-4769-8396-9639C45BE124}.Debug|Win64.ActiveCfg = Debug|x64
                {5163C576-6AA1-4769-8396-9639C45BE124}.Debug|Win64.Build.0 = Debug|x64
+               {5163C576-6AA1-4769-8396-9639C45BE124}.Debug|x64.ActiveCfg = Debug|x64
+               {5163C576-6AA1-4769-8396-9639C45BE124}.Debug|x64.Build.0 = Debug|x64
                {5163C576-6AA1-4769-8396-9639C45BE124}.Release|Win32.ActiveCfg = Release|Win32
                {5163C576-6AA1-4769-8396-9639C45BE124}.Release|Win32.Build.0 = Release|Win32
                {5163C576-6AA1-4769-8396-9639C45BE124}.Release|Win64.ActiveCfg = Release|x64
                {5163C576-6AA1-4769-8396-9639C45BE124}.Release|Win64.Build.0 = Release|x64
+               {5163C576-6AA1-4769-8396-9639C45BE124}.Release|x64.ActiveCfg = Release|x64
+               {5163C576-6AA1-4769-8396-9639C45BE124}.Release|x64.Build.0 = Release|x64
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Debug|Win32.ActiveCfg = Debug|Win32
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Debug|Win32.Build.0 = Debug|Win32
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Debug|Win64.ActiveCfg = Debug|x64
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Debug|Win64.Build.0 = Debug|x64
+               {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Debug|x64.ActiveCfg = Debug|x64
+               {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Debug|x64.Build.0 = Debug|x64
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Release|Win32.ActiveCfg = Release|Win32
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Release|Win32.Build.0 = Release|Win32
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Release|Win64.ActiveCfg = Release|x64
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Release|Win64.Build.0 = Release|x64
+               {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Release|x64.ActiveCfg = Release|x64
+               {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}.Release|x64.Build.0 = Release|x64
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Debug|Win32.ActiveCfg = Debug|Win32
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Debug|Win32.Build.0 = Debug|Win32
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Debug|Win64.ActiveCfg = Debug|x64
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Debug|Win64.Build.0 = Debug|x64
+               {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Debug|x64.ActiveCfg = Debug|x64
+               {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Debug|x64.Build.0 = Debug|x64
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Release|Win32.ActiveCfg = Release|Win32
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Release|Win32.Build.0 = Release|Win32
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Release|Win64.ActiveCfg = Release|x64
                {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Release|Win64.Build.0 = Release|x64
+               {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Release|x64.ActiveCfg = Release|x64
+               {D5EE8062-8FC5-40E8-81C0-B435B06AB311}.Release|x64.Build.0 = Release|x64
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Debug|Win32.ActiveCfg = Debug|Win32
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Debug|Win32.Build.0 = Debug|Win32
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Debug|Win64.ActiveCfg = Debug|Win32
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Debug|x64.ActiveCfg = Debug|x64
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Debug|x64.Build.0 = Debug|x64
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|Win32.ActiveCfg = Release|Win32
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|Win32.Build.0 = Release|Win32
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|Win64.ActiveCfg = Release|Win32
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|x64.ActiveCfg = Release|x64
+               {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|x64.Build.0 = Release|x64
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win32.ActiveCfg = Debug|Win32
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win32.Build.0 = Debug|Win32
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win64.ActiveCfg = Debug|Win32
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|x64.ActiveCfg = Debug|x64
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|x64.Build.0 = Debug|x64
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Release|Win32.ActiveCfg = Release|Win32
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Release|Win32.Build.0 = Release|Win32
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Release|Win64.ActiveCfg = Release|Win32
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Release|x64.ActiveCfg = Release|x64
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -257,16 +295,15 @@ Global
        GlobalSection(NestedProjects) = preSolution
                {EBEA7D10-66FB-4760-8AA8-81CD500D899E} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {38CE81CC-2660-4EF0-A936-4A337591DA3E} = {4A1773FD-DDED-4952-8700-C898E890554A}
-               {17C93245-8C20-4316-9573-1AE41D918C10} = {4A1773FD-DDED-4952-8700-C898E890554A}
-               {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F} = {4A1773FD-DDED-4952-8700-C898E890554A}
+               {8732E0CD-E3D0-41F2-A538-94884543890F} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7}
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7}
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416}
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416}
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416}
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416}
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416}
        EndGlobalSection
 EndGlobal

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 7dbb01470ab15e6dc474fe3702a25ead549388dd..8d8868a7c231132329d4227282cdf33ea8593f36 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -483,6 +483,7 @@ int Application::Run(void)
                (void) execv(exePath.CStr(), m_ArgV);
 #else /* _WIN32 */
                STARTUPINFO si;
+               PROCESS_INFORMATION pi;
                memset(&si, 0, sizeof(si));
                si.cb = sizeof(si);
                CreateProcess(NULL, GetCommandLine(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);

diff --git a/lib/base/debug.h b/lib/base/debug.h
index 06ce556cd2fa0acbdf69fd280463c953b28c9f03..c86e1e80d08e9fa693ce7b829d6e4f6b1e50bec6 100644 (file)
--- a/lib/base/debug.h
+++ b/lib/base/debug.h
@@ -31,12 +31,20 @@
 
 #define VERIFY(expr) ((expr) ? 0 : icinga_assert_fail(#expr, __FILE__, __LINE__))
 
-int icinga_assert_fail(const char *expr, const char *file, int line) __attribute__((noreturn));
+#ifdef __GNUC__
+#      define NORETURN __attribute__((noreturn))
+#else /* __GNUC__ */
+#      define NORETURN
+#endif /* __GNUC__ */
+
+int icinga_assert_fail(const char *expr, const char *file, int line) NORETURN;
 
 inline int icinga_assert_fail(const char *expr, const char *file, int line)
 {
        fprintf(stderr, "%s:%d: assertion failed: %s\n", file, line, expr);
        abort();
+
+       return 0;
 }
 
 #endif /* DEBUG_H */

diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp
index 1f2cc798bcc78d32034856b453e3dc9b4a80b0c2..f0b795c3f644733cd83aa444250ef455ece1538a 100644 (file)
--- a/lib/base/threadpool.cpp
+++ b/lib/base/threadpool.cpp
@@ -258,9 +258,6 @@ void ThreadPool::ManagerThreadProc(void)
                        if (utilization < 60 || utilization > 80 || alive < 8) {
                                double wthreads = ceil((utilization * alive) / 80.0);
 
-                               if (!finite(wthreads))
-                                       wthreads = 0;
-
                                int tthreads = wthreads - alive;
 
                                /* Don't ever kill the last 8 threads. */

diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index b350ff5a49923729d158023f921d3298bb1901f4..bad318bfde928f74588c58647e5ca64d1141a648 100644 (file)
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -497,14 +497,12 @@ String Utility::EscapeShellCmd(const String& s)
        return result;
 }
 
-void Utility::SetThreadName(const String& name)
-{
-       m_ThreadName.reset(new String(name));
-
 #ifdef _WIN32
+static void WindowsSetThreadName(const char *name)
+{
        THREADNAME_INFO info;
        info.dwType = 0x1000;
-       info.szName = name.CStr();
+       info.szName = name;
        info.dwThreadID = -1;
        info.dwFlags = 0;
 
@@ -513,6 +511,15 @@ void Utility::SetThreadName(const String& name)
        } __except(EXCEPTION_EXECUTE_HANDLER) {
                /* Nothing to do here. */
        }
+}
+#endif /* _WIN32 */
+
+void Utility::SetThreadName(const String& name)
+{
+       m_ThreadName.reset(new String(name));
+
+#ifdef _WIN32
+       WindowsSetThreadName(name.CStr());
 #endif /* _WIN32 */
 
 #ifdef __APPLE__

diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj
index 4361d50e7e2def35d6894938ed772c786b455969..8f037ff3c3a8e44aad86819374084d1b7ae83912 100644 (file)
--- a/lib/icinga/icinga.vcxproj
+++ b/lib/icinga/icinga.vcxproj
@@ -21,14 +21,11 @@
   <ItemGroup>
     <ClCompile Include="api.cpp" />
     <ClCompile Include="checkcommand.cpp" />
-    <ClCompile Include="checkresultmessage.cpp" />
     <ClCompile Include="cib.cpp" />
     <ClCompile Include="command.cpp" />
     <ClCompile Include="compatutility.cpp" />
-    <ClCompile Include="downtimemessage.cpp" />
     <ClCompile Include="eventcommand.cpp" />
     <ClCompile Include="externalcommandprocessor.cpp" />
-    <ClCompile Include="flappingmessage.cpp" />
     <ClCompile Include="host.cpp" />
     <ClCompile Include="hostgroup.cpp" />
     <ClCompile Include="icinga-type.cpp">
@@ -43,8 +40,6 @@
     <ClCompile Include="macroresolver.cpp" />
     <ClCompile Include="notification.cpp" />
     <ClCompile Include="notificationcommand.cpp" />
-    <ClCompile Include="notificationmessage.cpp" />
-    <ClCompile Include="notificationrequestmessage.cpp" />
     <ClCompile Include="nulleventtask.cpp" />
     <ClCompile Include="perfdatawriter.cpp" />
     <ClCompile Include="pluginchecktask.cpp" />
@@ -66,14 +61,11 @@
   <ItemGroup>
     <ClInclude Include="api.h" />
     <ClInclude Include="checkcommand.h" />
-    <ClInclude Include="checkresultmessage.h" />
     <ClInclude Include="cib.h" />
     <ClInclude Include="command.h" />
     <ClInclude Include="compatutility.h" />
-    <ClInclude Include="downtimemessage.h" />
     <ClInclude Include="eventcommand.h" />
     <ClInclude Include="externalcommandprocessor.h" />
-    <ClInclude Include="flappingmessage.h" />
     <ClInclude Include="host.h" />
     <ClInclude Include="hostgroup.h" />
     <ClInclude Include="i2-icinga.h" />
@@ -83,8 +75,6 @@
     <ClInclude Include="macroresolver.h" />
     <ClInclude Include="notification.h" />
     <ClInclude Include="notificationcommand.h" />
-    <ClInclude Include="notificationmessage.h" />
-    <ClInclude Include="notificationrequestmessage.h" />
     <ClInclude Include="nulleventtask.h" />
     <ClInclude Include="perfdatawriter.h" />
     <ClInclude Include="pluginchecktask.h" />
@@ -204,7 +194,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;remoting.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -220,7 +210,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;remoting.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -241,7 +231,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;remoting.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -262,7 +252,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;remoting.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/lib/icinga/icinga.vcxproj.filters b/lib/icinga/icinga.vcxproj.filters
index 8c66ebfd69b0030b615a918c1a775d2d3b882ee3..959dc8e2a0caed13883f4b6fa25164a7eabbdd75 100644 (file)
--- a/lib/icinga/icinga.vcxproj.filters
+++ b/lib/icinga/icinga.vcxproj.filters
@@ -31,15 +31,6 @@
     <ClCompile Include="externalcommandprocessor.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="checkresultmessage.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="downtimemessage.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="flappingmessage.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="service-comment.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -52,12 +43,6 @@
     <ClCompile Include="notification.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="notificationmessage.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="notificationrequestmessage.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="service-check.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -150,27 +135,12 @@
     <ClInclude Include="externalcommandprocessor.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="checkresultmessage.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="downtimemessage.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="flappingmessage.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="pluginnotificationtask.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
     <ClInclude Include="notification.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="notificationmessage.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="notificationrequestmessage.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="api.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index 35da7c1e489a099f69a3131f0896f886f8aae134..5077f6031aa003ce501fa97456032b60c6864f94 100644 (file)
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -188,7 +188,7 @@ void Notification::SetNextNotification(double time, const String& authority)
 {
        m_NextNotification = time;
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnNextNotificationChanged), GetSelf(), time, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnNextNotificationChanged), GetSelf(), time, authority));
 }
 
 long Notification::GetNotificationNumber(void) const

diff --git a/lib/icinga/perfdatawriter.cpp b/lib/icinga/perfdatawriter.cpp
index 2ed7439397b8804e2590773a7942689d561ddb34..77f357d42cc49f8c2744116f66770e60a4aec943 100644 (file)
--- a/lib/icinga/perfdatawriter.cpp
+++ b/lib/icinga/perfdatawriter.cpp
@@ -41,7 +41,7 @@ void PerfdataWriter::Start(void)
 {
        DynamicObject::Start();
 
-       Service::OnNewCheckResult.connect(bind(&PerfdataWriter::CheckResultHandler, this, _1, _2));
+       Service::OnNewCheckResult.connect(boost::bind(&PerfdataWriter::CheckResultHandler, this, _1, _2));
 
        m_RotationTimer = boost::make_shared<Timer>();
        m_RotationTimer->OnTimerExpired.connect(boost::bind(&PerfdataWriter::RotationTimerHandler, this));

diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp
index 8afd615dbd8dcfcbbeaa1d639a56084319cb8727..74033c52c294fbd56be7348e8b8c863d74524eed 100644 (file)
--- a/lib/icinga/service-check.cpp
+++ b/lib/icinga/service-check.cpp
@@ -101,7 +101,7 @@ void Service::SetNextCheck(double nextCheck, const String& authority)
 {
        m_NextCheck = nextCheck;
 
-       Utility::QueueAsyncCallback(bind(boost::ref(Service::OnNextCheckChanged), GetSelf(), nextCheck, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(Service::OnNextCheckChanged), GetSelf(), nextCheck, authority));
 }
 
 double Service::GetNextCheck(void)
@@ -411,7 +411,7 @@ void Service::SetEnableActiveChecks(bool enabled, const String& authority)
 {
        m_EnableActiveChecks = enabled ? 1 : 0;
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnEnableActiveChecksChanged), GetSelf(), enabled, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnEnableActiveChecksChanged), GetSelf(), enabled, authority));
 }
 
 bool Service::GetEnablePassiveChecks(void) const
@@ -426,7 +426,7 @@ void Service::SetEnablePassiveChecks(bool enabled, const String& authority)
 {
        m_EnablePassiveChecks = enabled ? 1 : 0;
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnEnablePassiveChecksChanged), GetSelf(), enabled, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnEnablePassiveChecksChanged), GetSelf(), enabled, authority));
 }
 
 bool Service::GetForceNextCheck(void) const
@@ -441,7 +441,7 @@ void Service::SetForceNextCheck(bool forced, const String& authority)
 {
        m_ForceNextCheck = forced ? 1 : 0;
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnForceNextCheckChanged), GetSelf(), forced, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnForceNextCheckChanged), GetSelf(), forced, authority));
 }
 
 void Service::ProcessCheckResult(const Dictionary::Ptr& cr, const String& authority)
@@ -618,7 +618,7 @@ void Service::ProcessCheckResult(const Dictionary::Ptr& cr, const String& author
                        " threshold: " + Convert::ToString(GetFlappingThreshold()) +
                        "% current: " + Convert::ToString(GetFlappingCurrent()) + "%.");
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnNewCheckResult), GetSelf(), cr, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnNewCheckResult), GetSelf(), cr, authority));
        OnStateChanged(GetSelf());
 
        if (call_eventhandler)

diff --git a/lib/icinga/service-comment.cpp b/lib/icinga/service-comment.cpp
index 92807a1aff625ecacc29702fda09eaf6a0d153cb..b3b5b812a13e10ea7fb72b3e5ce3a6f956f02ae8 100644 (file)
--- a/lib/icinga/service-comment.cpp
+++ b/lib/icinga/service-comment.cpp
@@ -102,7 +102,7 @@ String Service::AddComment(CommentType entryType, const String& author,
                l_CommentsCache[uid] = GetSelf();
        }
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnCommentAdded), GetSelf(), comment, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnCommentAdded), GetSelf(), comment, authority));
 
        return uid;
 }
@@ -155,7 +155,7 @@ void Service::RemoveComment(const String& id, const String& authority)
                l_CommentsCache.erase(id);
        }
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnCommentRemoved), owner, comment, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnCommentRemoved), owner, comment, authority));
 }
 
 String Service::GetCommentIDFromLegacyID(int id)

diff --git a/lib/icinga/service-downtime.cpp b/lib/icinga/service-downtime.cpp
index 7f1a9e46f5bca0d4022bafb9f018f6d9695fc687..404c5d6c26238008e46ce755b239454ae84f53c5 100644 (file)
--- a/lib/icinga/service-downtime.cpp
+++ b/lib/icinga/service-downtime.cpp
@@ -116,7 +116,7 @@ String Service::AddDowntime(const String& comment_id,
                l_DowntimesCache[uid] = GetSelf();
        }
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnDowntimeAdded), GetSelf(), downtime, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnDowntimeAdded), GetSelf(), downtime, authority));
 
        return uid;
 }
@@ -152,7 +152,7 @@ void Service::RemoveDowntime(const String& id, const String& authority)
        
        RemoveComment(comment_id);
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnDowntimeRemoved), owner, downtime, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnDowntimeRemoved), owner, downtime, authority));
 }
 
 void Service::TriggerDowntimes(void)
@@ -202,7 +202,7 @@ void Service::TriggerDowntime(const String& id)
                TriggerDowntime(tid);
        }
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnDowntimeTriggered), owner, downtime));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnDowntimeTriggered), owner, downtime));
 }
 
 String Service::GetDowntimeIDFromLegacyID(int id)

diff --git a/lib/icinga/service-flapping.cpp b/lib/icinga/service-flapping.cpp
index 276e97730b67cf6044683044c7a87794ebcad756..abba147b7ee0e25ab5a550574b5a4ecad20f9d2f 100644 (file)
--- a/lib/icinga/service-flapping.cpp
+++ b/lib/icinga/service-flapping.cpp
@@ -62,7 +62,7 @@ void Service::SetEnableFlapping(bool enabled, const String& authority)
        m_EnableFlapping = enabled;
 
        OnFlappingChanged(GetSelf(), enabled ? FlappingEnabled : FlappingDisabled);
-       Utility::QueueAsyncCallback(bind(boost::ref(OnEnableFlappingChanged), GetSelf(), enabled, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnEnableFlappingChanged), GetSelf(), enabled, authority));
 }
 
 void Service::UpdateFlappingStatus(bool stateChange)

diff --git a/lib/icinga/service-notification.cpp b/lib/icinga/service-notification.cpp
index 0ad7a2bed191db171e37e6be039bdc41c0f35068..5ccfe28a2a7249f08d0804eabc1c865731adecb8 100644 (file)
--- a/lib/icinga/service-notification.cpp
+++ b/lib/icinga/service-notification.cpp
@@ -211,7 +211,7 @@ void Service::SetEnableNotifications(bool enabled, const String& authority)
 {
        m_EnableNotifications = enabled;
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnEnableNotificationsChanged), GetSelf(), enabled, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnEnableNotificationsChanged), GetSelf(), enabled, authority));
 }
 
 bool Service::GetForceNextNotification(void) const
@@ -226,5 +226,5 @@ void Service::SetForceNextNotification(bool forced, const String& authority)
 {
        m_ForceNextNotification = forced ? 1 : 0;
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnForceNextNotificationChanged), GetSelf(), forced, authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnForceNextNotificationChanged), GetSelf(), forced, authority));
 }

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 2f5a068f9c6cd7cd71bc3ecc332c17b3a3658aaf..61a65b55eedf6e5544aef387e2b88262dc8039fd 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -29,6 +29,7 @@
 #include "base/utility.h"
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/foreach.hpp>
+#include <boost/bind/apply.hpp>
 
 using namespace icinga;
 
@@ -37,6 +38,10 @@ REGISTER_TYPE(Service);
 boost::signals2::signal<void (const Service::Ptr&, const String&, const String&, AcknowledgementType, double, const String&)> Service::OnAcknowledgementSet;
 boost::signals2::signal<void (const Service::Ptr&, const String&)> Service::OnAcknowledgementCleared;
 
+Service::Service(void)
+       : m_CheckRunning(false)
+{ }
+
 void Service::Start(void)
 {
        DynamicObject::Start();
@@ -249,7 +254,8 @@ void Service::AcknowledgeProblem(const String& author, const String& comment, Ac
 
        OnNotificationsRequested(GetSelf(), NotificationAcknowledgement, GetLastCheckResult(), author, comment);
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnAcknowledgementSet), GetSelf(), author, comment, type, expiry, authority));
+       boost::function<void (void)> f = boost::bind(boost::ref(Service::OnAcknowledgementSet), GetSelf(), author, comment, type, expiry, authority);
+       Utility::QueueAsyncCallback(f);
 }
 
 void Service::ClearAcknowledgement(const String& authority)
@@ -259,7 +265,7 @@ void Service::ClearAcknowledgement(const String& authority)
        m_Acknowledgement = AcknowledgementNone;
        m_AcknowledgementExpiry = 0;
 
-       Utility::QueueAsyncCallback(bind(boost::ref(OnAcknowledgementCleared), GetSelf(), authority));
+       Utility::QueueAsyncCallback(boost::bind(boost::ref(OnAcknowledgementCleared), GetSelf(), authority));
 }
 
 std::set<Host::Ptr> Service::GetParentHosts(void) const

diff --git a/lib/icinga/service.h b/lib/icinga/service.h
index c38a537bedaf0e1237afb335f17f9d341d5faff4..b56177cd799649e998464dbbd57fead1ff7ce07e 100644 (file)
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.h
@@ -110,6 +110,8 @@ public:
        DECLARE_PTR_TYPEDEFS(Service);
        DECLARE_TYPENAME(Service);
 
+       Service(void);
+
        static Service::Ptr GetByNamePair(const String& hostName, const String& serviceName);
 
        static const int DefaultMaxCheckAttempts;

diff --git a/lib/ido/dbvalue.h b/lib/ido/dbvalue.h
index cb2ddc043e554c847ece163c795ccee7ae567253..89b71af5b5c2cc317cd8f8b14f34e5362c0f8ccf 100644 (file)
--- a/lib/ido/dbvalue.h
+++ b/lib/ido/dbvalue.h
@@ -44,6 +44,8 @@ struct DbValue : public Object
 public:
        DECLARE_PTR_TYPEDEFS(DbValue);
 
+       DbValue(DbValueType type, const Value& value);
+
        static Value FromTimestamp(const Value& ts);
        static Value FromTimestampNow(void);
        static Value FromValue(const Value& value);
@@ -57,11 +59,6 @@ public:
        DbValueType GetType(void) const;
        Value GetValue(void) const;
 
-protected:
-       DbValue(DbValueType type, const Value& value);
-
-       friend DbValue::Ptr boost::make_shared<DbValue, DbValueType, Value>(const icinga::DbValueType&, const icinga::Value&);
-
 private:
        DbValueType m_Type;
        Value m_Value;

diff --git a/lib/ido/ido.vcxproj b/lib/ido/ido.vcxproj
index fcf55e5d2b5097ee2b70cf765854eb28bdeb3e48..79ddf52f6f8e44c702e061e183218f0ca1e011d6 100644 (file)
--- a/lib/ido/ido.vcxproj
+++ b/lib/ido/ido.vcxproj
@@ -18,8 +18,62 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="commanddbobject.cpp" />
+    <ClCompile Include="dbconnection.cpp" />
+    <ClCompile Include="dbobject.cpp" />
+    <ClCompile Include="dbquery.cpp" />
+    <ClCompile Include="dbreference.cpp" />
+    <ClCompile Include="dbtype.cpp" />
+    <ClCompile Include="dbvalue.cpp" />
+    <ClCompile Include="hostdbobject.cpp" />
+    <ClCompile Include="hostgroupdbobject.cpp" />
+    <ClCompile Include="ido-type.cpp" />
+    <ClCompile Include="servicedbobject.cpp" />
+    <ClCompile Include="servicegroupdbobject.cpp" />
+    <ClCompile Include="timeperioddbobject.cpp" />
+    <ClCompile Include="userdbobject.cpp" />
+    <ClCompile Include="usergroupdbobject.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="commanddbobject.h" />
+    <ClInclude Include="dbconnection.h" />
+    <ClInclude Include="dbobject.h" />
+    <ClInclude Include="dbquery.h" />
+    <ClInclude Include="dbreference.h" />
+    <ClInclude Include="dbtype.h" />
+    <ClInclude Include="dbvalue.h" />
+    <ClInclude Include="hostdbobject.h" />
+    <ClInclude Include="hostgroupdbobject.h" />
+    <ClInclude Include="servicedbobject.h" />
+    <ClInclude Include="servicegroupdbobject.h" />
+    <ClInclude Include="timeperioddbobject.h" />
+    <ClInclude Include="userdbobject.h" />
+    <ClInclude Include="usergroupdbobject.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="ido-type.conf">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Preparing config fragment for embedding</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Preparing config fragment for embedding</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Preparing config fragment for embedding</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Preparing config fragment for embedding</Message>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2E6C1133-730F-4875-A72C-B455B1DD4C5C}</ProjectGuid>
+    <ProjectGuid>{87BBCE4C-36F5-4C04-90FB-9B74618AF988}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>demo</RootNamespace>
   </PropertyGroup>
@@ -102,7 +156,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +171,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,7 +190,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -155,38 +209,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="democomponent.h" />
-    <ClInclude Include="i2-demo.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="demo-type.cpp" />
-    <ClCompile Include="democomponent.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="demo-type.conf">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Preparing config fragment for embedding</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-    </CustomBuild>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/lib/ido/ido.vcxproj.filters b/lib/ido/ido.vcxproj.filters
index 922435a5279187f400ac03cec35982b2c482fbd1..f6e4a8ea537b2f19042391d330b7d50895532c72 100644 (file)
--- a/lib/ido/ido.vcxproj.filters
+++ b/lib/ido/ido.vcxproj.filters
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="democomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="i2-demo.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="Headerdateien">
       <UniqueIdentifier>{11a495bf-a705-4766-b3d3-9b5db266a6ef}</UniqueIdentifier>
@@ -17,15 +9,98 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="democomponent.cpp">
+    <ClCompile Include="commanddbobject.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="dbconnection.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="dbobject.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="dbquery.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="dbreference.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="dbtype.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="dbvalue.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="hostdbobject.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="hostgroupdbobject.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="servicedbobject.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="servicegroupdbobject.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="timeperioddbobject.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="userdbobject.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="usergroupdbobject.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="demo-type.cpp">
+    <ClCompile Include="ido-type.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="demo-type.conf">
+    <ClInclude Include="commanddbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="usergroupdbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="dbconnection.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="dbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="dbquery.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="dbreference.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="dbtype.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="dbvalue.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="hostdbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="hostgroupdbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="servicedbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="servicegroupdbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="timeperioddbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="userdbobject.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="ido-type.conf">
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>

diff --git a/test/base-array.cpp b/test/base-array.cpp
index 2b46ad8777c84fca325a6a92378056167f79eb62..dfd9088f6a91c6e393fa64904d08e55c7f2f88b5 100644 (file)
--- a/test/base-array.cpp
+++ b/test/base-array.cpp
@@ -105,35 +105,6 @@ BOOST_AUTO_TEST_CASE(clone)
        BOOST_CHECK(clone->Get(2) == 5);
 }
 
-BOOST_AUTO_TEST_CASE(seal)
-{
-       Array::Ptr array = boost::make_shared<Array>();
-       array->Add(7);
-
-       BOOST_CHECK(!array->IsSealed());
-       array->Seal();
-       BOOST_CHECK(array->IsSealed());
-
-       BOOST_CHECK_THROW(array->Add(2), boost::exception);
-       BOOST_CHECK(array->GetLength() == 1);
-
-       BOOST_CHECK_THROW(array->Set(0, 8), boost::exception);
-       BOOST_CHECK(array->Get(0) == 7);
-
-       BOOST_CHECK_THROW(array->Remove(0), boost::exception);
-       BOOST_CHECK(array->GetLength() == 1);
-       BOOST_CHECK(array->Get(0) == 7);
-
-       {
-               ObjectLock olock(array);
-               Array::Iterator it = array->Begin();
-               BOOST_CHECK_THROW(array->Remove(it), boost::exception);
-       }
-
-       BOOST_CHECK(array->GetLength() == 1);
-       BOOST_CHECK(array->Get(0) == 7);
-}
-
 BOOST_AUTO_TEST_CASE(serialize)
 {
        Array::Ptr array = boost::make_shared<Array>();

diff --git a/test/base-dictionary.cpp b/test/base-dictionary.cpp
index 540e4d5678e2eb2105a6fc33a87c91a69c0efd6d..5ef3b714c8562b77843cd99a334c6c5898456f85 100644 (file)
--- a/test/base-dictionary.cpp
+++ b/test/base-dictionary.cpp
@@ -162,35 +162,6 @@ BOOST_AUTO_TEST_CASE(clone)
        BOOST_CHECK(dictionary->Get("test2") == "hello world");
 }
 
-BOOST_AUTO_TEST_CASE(seal)
-{
-       Dictionary::Ptr dictionary = boost::make_shared<Dictionary>();
-       dictionary->Set("test1", 7);
-
-       BOOST_CHECK(!dictionary->IsSealed());
-       dictionary->Seal();
-       BOOST_CHECK(dictionary->IsSealed());
-
-       BOOST_CHECK_THROW(dictionary->Set("test2", "hello world"), boost::exception);
-       BOOST_CHECK(dictionary->GetLength() == 1);
-
-       BOOST_CHECK_THROW(dictionary->Set("test1", 8), boost::exception);
-       BOOST_CHECK(dictionary->Get("test1") == 7);
-
-       BOOST_CHECK_THROW(dictionary->Remove("test1"), boost::exception);
-       BOOST_CHECK(dictionary->GetLength() == 1);
-       BOOST_CHECK(dictionary->Get("test1") == 7);
-
-       {
-               ObjectLock olock(dictionary);
-               Dictionary::Iterator it = dictionary->Begin();
-               BOOST_CHECK_THROW(dictionary->Remove(it), boost::exception);
-       }
-
-       BOOST_CHECK(dictionary->GetLength() == 1);
-       BOOST_CHECK(dictionary->Get("test1") == 7);
-}
-
 BOOST_AUTO_TEST_CASE(serialize)
 {
        Dictionary::Ptr dictionary = boost::make_shared<Dictionary>();