From 2fbec833a26a770daf88e70880ba03736c106ec5 Mon Sep 17 00:00:00 2001 From: JDierkse Date: Thu, 5 Mar 2020 13:00:55 +0100 Subject: [PATCH] Change clipp include --- Application/PresenceDetection.cc | 8 ++++---- Libraries/clipp | 1 - Util/clipp.h | 6 ++++-- 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 120000 Libraries/clipp diff --git a/Application/PresenceDetection.cc b/Application/PresenceDetection.cc index 53d1e62..8ec1b88 100644 --- a/Application/PresenceDetection.cc +++ b/Application/PresenceDetection.cc @@ -20,13 +20,13 @@ int main(int argc, char** argv) openlog("PresenceDetection", LOG_NDELAY | LOG_PID, LOG_USER); bool daemon = false; - PresenceDetection::Util::group cli { - PresenceDetection::Util::option("-d", "--daemon").set(daemon).doc("Run the process as Daemon") + PresenceDetection::Util::clipp::group cli { + PresenceDetection::Util::clipp::option("-d", "--daemon").set(daemon).doc("Run the process as Daemon") }; - if (!PresenceDetection::Util::parse(argc, argv, cli)) + if (!PresenceDetection::Util::clipp::parse(argc, argv, cli)) { - std::cout << PresenceDetection::Util::make_man_page(cli, argv[0]) << std::endl; + std::cout << PresenceDetection::Util::clipp::make_man_page(cli, argv[0]) << std::endl; return 1; } diff --git a/Libraries/clipp b/Libraries/clipp deleted file mode 120000 index e67602a..0000000 --- a/Libraries/clipp +++ /dev/null @@ -1 +0,0 @@ -../../Libraries/clipp/include \ No newline at end of file diff --git a/Util/clipp.h b/Util/clipp.h index c0874a1..1df1ab8 100644 --- a/Util/clipp.h +++ b/Util/clipp.h @@ -6,10 +6,12 @@ namespace PresenceDetection { namespace Util { +namespace clipp { -using namespace clipp; +using namespace ::clipp; +} // namespace clipp } // namespace Util -} // namespace DomoticaServer +} // namespace PresenceDetection #endif // UTIL_CLIPP_H