From ff0b6ba6301d8520606ad2ba2539006f7da251e5 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 13 Dec 2017 11:35:38 +0100 Subject: [PATCH] Fix build problems with Visual Studio 2017 --- CMakeLists.txt | 3 ++- choco/CMakeLists.txt | 2 +- lib/base/console.cpp | 7 +++++-- lib/base/functionwrapper.hpp | 9 +++++---- test/CMakeLists.txt | 6 +++++- test/icinga-checkable-flapping.cpp | 6 +++--- test/icinga-checkable-test.cpp | 21 --------------------- 7 files changed, 21 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9af23aef4..32c3a26a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,8 @@ endif() if(WIN32) set(Boost_USE_STATIC_LIBS ON) add_definitions(-DBOOST_ALL_NO_LIB) - add_definitions(/bigobj) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /bigobj") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") endif() if(NOT DEFINED LOGROTATE_HAS_SU) diff --git a/choco/CMakeLists.txt b/choco/CMakeLists.txt index 60be37217..69c758eab 100644 --- a/choco/CMakeLists.txt +++ b/choco/CMakeLists.txt @@ -24,6 +24,6 @@ if(WIN32) add_custom_target(choco-pkg ALL COMMAND choco pack COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/icinga2.${SPEC_VERSION}.nupkg ${CMAKE_CURRENT_BINARY_DIR}/icinga2.nupkg - DEPENDS icinga2.nuspec ${CMAKE_CURRENT_BINARY_DIR}/chocolateyInstall.ps1 chocolateyUninstall.ps1 + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/icinga2.nuspec ${CMAKE_CURRENT_BINARY_DIR}/chocolateyInstall.ps1 chocolateyUninstall.ps1 ) endif() diff --git a/lib/base/console.cpp b/lib/base/console.cpp index 62dccd2df..057807995 100644 --- a/lib/base/console.cpp +++ b/lib/base/console.cpp @@ -25,7 +25,8 @@ using namespace icinga; static ConsoleType l_ConsoleType = Console_Dumb; -INITIALIZE_ONCE([]() { +static void InitializeConsole(void) +{ l_ConsoleType = Console_Dumb; #ifndef _WIN32 @@ -34,7 +35,9 @@ INITIALIZE_ONCE([]() { #else /* _WIN32 */ l_ConsoleType = Console_Windows; #endif /* _WIN32 */ -}) +} + +INITIALIZE_ONCE(InitializeConsole); ConsoleColorTag::ConsoleColorTag(int color, ConsoleType consoleType) : m_Color(color), m_ConsoleType(consoleType) diff --git a/lib/base/functionwrapper.hpp b/lib/base/functionwrapper.hpp index a87efeeaf..a8cbce913 100644 --- a/lib/base/functionwrapper.hpp +++ b/lib/base/functionwrapper.hpp @@ -23,6 +23,7 @@ #include "base/i2-base.hpp" #include "base/value.hpp" #include +#include #include using namespace std::placeholders; @@ -80,9 +81,9 @@ private: public: template auto operator () (FuncType f, const std::vector& args) - -> decltype(call(f, args, BuildIndices::type>::arity>{})) + -> decltype(call(f, args, BuildIndices::type>::value>{})) { - return call(f, args, BuildIndices::type>::arity>{}); + return call(f, args, BuildIndices::type>::value>{}); } }; @@ -96,7 +97,7 @@ std::function&)> WrapFunction(FuncType function, EnableIf())), void>::value>* = 0) { return [function](const std::vector& arguments) { - constexpr int arity = boost::function_traits::type>::arity; + constexpr int arity = boost::function_types::function_arity::type>::value; if (arguments.size() < arity) BOOST_THROW_EXCEPTION(std::invalid_argument("Too few arguments for function.")); @@ -113,7 +114,7 @@ std::function&)> WrapFunction(FuncType function, EnableIf())), void>::value>* = 0) { return [function](const std::vector& arguments) { - constexpr int arity = boost::function_traits::type>::arity; + constexpr int arity = boost::function_types::function_arity::type>::value; if (arity > 0) { if (arguments.size() < arity) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2a234419d..62f1ce847 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -141,8 +141,12 @@ set(icinga_checkable_test_SOURCES icinga-checkable-flapping.cpp ) +if(ICINGA2_UNITY_BUILD) + mkunity_target(icinga_checkable test icinga_checkable_test_SOURCES) +endif() + add_boost_test(icinga_checkable - SOURCES icinga-checkable-test.cpp ${icinga_checkable_test_SOURCES} + SOURCES test-runner.cpp icinga-checkable-test.cpp ${icinga_checkable_test_SOURCES} LIBRARIES base config icinga cli TESTS icinga_checkable_flapping/host_not_flapping icinga_checkable_flapping/host_flapping diff --git a/test/icinga-checkable-flapping.cpp b/test/icinga-checkable-flapping.cpp index 1618fd3eb..8efc89650 100644 --- a/test/icinga-checkable-flapping.cpp +++ b/test/icinga-checkable-flapping.cpp @@ -17,10 +17,10 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include -#include #include "icinga/host.hpp" +#include #include +#include using namespace icinga; @@ -48,7 +48,7 @@ static void LogFlapping(const Checkable::Ptr& obj) int oldestIndex = (obj->GetFlappingBuffer() & 0xFF00000) >> 20; std::cout << "Flapping: " << obj->IsFlapping() << "\nHT: " << obj->GetFlappingThresholdHigh() << " LT: " << obj->GetFlappingThresholdLow() - << "\nOur value: " << obj->GetFlappingCurrent() << "\nPtr: " << oldestIndex << " Buf: " << stateChangeBuf << '\n'; + << "\nOur value: " << obj->GetFlappingCurrent() << "\nPtr: " << oldestIndex << " Buf: " << stateChangeBuf.to_ulong() << '\n'; } diff --git a/test/icinga-checkable-test.cpp b/test/icinga-checkable-test.cpp index dee1adc8a..9178f85a5 100644 --- a/test/icinga-checkable-test.cpp +++ b/test/icinga-checkable-test.cpp @@ -17,9 +17,6 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#define BOOST_TEST_MAIN -#define BOOST_TEST_MODULE icinga2_test - #include "cli/daemonutility.hpp" #include "base/application.hpp" #include "base/loader.hpp" @@ -35,24 +32,6 @@ struct IcingaCheckableFixture BOOST_TEST_MESSAGE("setup running Icinga 2 core"); Application::InitializeBase(); - - /* start the Icinga application and load the configuration */ - Application::DeclareSysconfDir("etc"); - Application::DeclareLocalStateDir("var"); - - ActivationScope ascope; - - Loader::LoadExtensionLibrary("icinga"); - Loader::LoadExtensionLibrary("methods"); //loaded by ITL - - std::vector configs; - std::vector newItems; - - DaemonUtility::LoadConfigFiles(configs, newItems, "icinga2.debug", "icinga2.vars"); - - /* ignore config errors */ - WorkQueue upq; - ConfigItem::ActivateItems(upq, newItems); } ~IcingaCheckableFixture(void)