From d9a943b3005d1660802a3b346d0eecee51b2dd20 Mon Sep 17 00:00:00 2001 From: bergmann Date: Sat, 17 Aug 2019 21:19:44 +0200 Subject: [PATCH] * Use convert_cast instead of static_cast where feasible --- cmake/config.h.in | 7 +++++++ include/cppcurl/easy.inl | 2 +- include/cppcurl/exception.inl | 4 ++-- test/CMakeLists.txt | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmake/config.h.in b/cmake/config.h.in index 46cae64..4176b70 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in @@ -1,3 +1,10 @@ #pragma once #cmakedefine CPPCURL_HAS_CPPCORE + +#ifdef CPPCURL_HAS_CPPCORE + #include + #define cppcurl_convert_cast ::cppcore::convert_cast +#else + #define cppcurl_convert_cast static_cast +#endif diff --git a/include/cppcurl/easy.inl b/include/cppcurl/easy.inl index 3dc851f..468b5a6 100644 --- a/include/cppcurl/easy.inl +++ b/include/cppcurl/easy.inl @@ -26,7 +26,7 @@ namespace cppcurl static inline void write(CURL* handle, CURLoption opt, bool val) { easy_exception::throw_error( - curl_easy_setopt(handle, opt, static_cast(val)), + curl_easy_setopt(handle, opt, cppcurl_convert_cast(val)), "Unable to set option on easy handle."); } }; diff --git a/include/cppcurl/exception.inl b/include/cppcurl/exception.inl index 0bc8d49..88a0150 100644 --- a/include/cppcurl/exception.inl +++ b/include/cppcurl/exception.inl @@ -55,7 +55,7 @@ namespace cppcurl { os << error_str << '(' - << static_cast(error) + << cppcurl_convert_cast(error) << "): " << message; } @@ -63,7 +63,7 @@ namespace cppcurl template exception ::exception(T_error err, const std::string& msg) - : _what (__impl::get_error_str()(err) + "(" + std::to_string(static_cast(err)) + "): " + msg) + : _what (__impl::get_error_str()(err) + "(" + std::to_string(cppcurl_convert_cast(err)) + "): " + msg) , error (err) , error_str (__impl::get_error_str()(err)) { } diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 21f6495..d57c118 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -45,7 +45,7 @@ ForEach ( FILE IN LISTS CPPCURL_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 cppcurl ) Else ( ) Add_Test ( NAME ${TEST_NAME} COMMAND ${TEST_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) EndIf ( )