From 70ae03732476f38bc90dded8ba76704073fc937e Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 23 Oct 2014 18:20:39 +0200 Subject: [PATCH] Fix unity build fixes #7433 --- lib/cli/CMakeLists.txt | 3 +-- lib/cli/agentblackandwhitelistcommand.hpp | 2 +- lib/cli/repositoryobjectcommand.hpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/cli/CMakeLists.txt b/lib/cli/CMakeLists.txt index 70063400e..fd6006945 100644 --- a/lib/cli/CMakeLists.txt +++ b/lib/cli/CMakeLists.txt @@ -24,9 +24,8 @@ set(cli_SOURCES objectlistcommand.cpp pkinewcacommand.cpp pkinewcertcommand.cpp pkisigncsrcommand.cpp pkirequestcommand.cpp pkisavecertcommand.cpp pkiticketcommand.cpp pkiutility.cpp - repositoryobjectcommand.cpp - variablegetcommand.cpp variablelistcommand.cpp repositorycommitcommand.cpp repositoryobjectcommand.cpp repositoryutility.cpp + variablegetcommand.cpp variablelistcommand.cpp ) if(ICINGA2_UNITY_BUILD) diff --git a/lib/cli/agentblackandwhitelistcommand.hpp b/lib/cli/agentblackandwhitelistcommand.hpp index 656c61d39..921dec527 100644 --- a/lib/cli/agentblackandwhitelistcommand.hpp +++ b/lib/cli/agentblackandwhitelistcommand.hpp @@ -67,7 +67,7 @@ public: }; #define REGISTER_BLACKANDWHITELIST_CLICOMMAND(type) \ - namespace { namespace UNIQUE_NAME(cli) { \ + namespace { namespace UNIQUE_NAME(blackandwhitelist) { \ I2_EXPORT icinga::RegisterBlackAndWhitelistCLICommandHelper l_RegisterBlackAndWhitelistCLICommand(type); \ } } diff --git a/lib/cli/repositoryobjectcommand.hpp b/lib/cli/repositoryobjectcommand.hpp index 4501f5e17..4b9f83397 100644 --- a/lib/cli/repositoryobjectcommand.hpp +++ b/lib/cli/repositoryobjectcommand.hpp @@ -69,7 +69,7 @@ public: }; #define REGISTER_REPOSITORY_CLICOMMAND(type) \ - namespace { namespace UNIQUE_NAME(cli) { \ + namespace { namespace UNIQUE_NAME(repositoryobject) { \ I2_EXPORT icinga::RegisterRepositoryCLICommandHelper l_RegisterRepositoryCLICommand(type); \ } } -- 2.40.0