From 7396db4c76cbee0954f37cccfe4223ce1148c4be Mon Sep 17 00:00:00 2001
From: bergmann <info@bergmann89.de>
Date: Sat, 17 Aug 2019 21:20:31 +0200
Subject: [PATCH] * Use convert_cast instead of static_cast where feasible

---
 include/cppmicrohttpd/daemon.inl | 4 +++-
 src/cppmicrohttpd/damon.cpp      | 2 +-
 test/CMakeLists.txt              | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/cppmicrohttpd/daemon.inl b/include/cppmicrohttpd/daemon.inl
index 623606b..d0cd386 100644
--- a/include/cppmicrohttpd/daemon.inl
+++ b/include/cppmicrohttpd/daemon.inl
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cppcore/conversion/convert_cast.h>
+
 #include "daemon.h"
 
 namespace cppmicrohttpd
@@ -41,7 +43,7 @@ namespace cppmicrohttpd
         unsigned long long timeout = 0;
         if (MHD_get_timeout(_handle.get(), &timeout) != MHD_YES)
             return -1;
-        return static_cast<long long>(timeout);
+        return cppcore::convert_cast<long long>(timeout);
     }
 
 }
diff --git a/src/cppmicrohttpd/damon.cpp b/src/cppmicrohttpd/damon.cpp
index 9ea8b5a..04f9e03 100644
--- a/src/cppmicrohttpd/damon.cpp
+++ b/src/cppmicrohttpd/damon.cpp
@@ -17,7 +17,7 @@ daemon::daemon(
     options.emplace_back(MHD_OptionItem { MHD_OPTION_END, 0, nullptr });
 
     _handle.reset(MHD_start_daemon(
-        static_cast<unsigned int>(flags),
+        flags.value,
         port,
         nullptr,
         nullptr,
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 72a0b8c..6039ed6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -61,7 +61,7 @@ ForEach                     ( FILE IN LISTS CPPMICROHTTPD_TEST_SOURCE_FILES )
 
     # test
     If                          ( HAS_CMAKE_TESTS )
-        Add_CMake_Test              ( NAME ${TEST_NAME} TARGET ${TEST_NAME} )
+        Add_CMake_Test              ( NAME ${TEST_NAME} TARGET ${TEST_NAME} GROUP cppmicrohttpd )
     Else                        ( )
         Add_Test                    ( NAME ${TEST_NAME} COMMAND ${TEST_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
     EndIf                       ( )