[checkmk-commits] compilation fix(error during resolving comflicts)

Module: check_mk Branch: master Commit: 676f8b9b9984cb37be61811da50c58d2de9b896e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=676f8b9b9984cb… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon May 6 11:38:49 2019 +0200 compilation fix(error during resolving comflicts) Change-Id: If303fdbc3cec0328d4c24f3c04d7f2e5cd16a2b7 --- agents/wnx/watest/test_tools.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/wnx/watest/test_tools.h b/agents/wnx/watest/test_tools.h index 501c6f9..873b412 100644 --- a/agents/wnx/watest/test_tools.h +++ b/agents/wnx/watest/test_tools.h @@ -14,13 +14,13 @@ public: using namespace cma::cfg; std::error_code ec; std::filesystem::remove(cma::cfg::GetBakeryFile(), ec); - cma::OnStart(cma::kTest); + cma::OnStart(cma::AppType::test); auto yaml = GetLoadedConfig(); ProcessKnownConfigGroups(); SetupEnvironmentFromGroups(); } - ~YamlLoader() { OnStart(cma::kTest); } + ~YamlLoader() { OnStart(cma::AppType::test); } }; inline void CreateFile(std::filesystem::path Path, std::string Content) {