| @@ -1,3 +1,10 @@ | |||||
| #pragma once | #pragma once | ||||
| #cmakedefine CPPCURL_HAS_CPPCORE | #cmakedefine CPPCURL_HAS_CPPCORE | ||||
| #ifdef CPPCURL_HAS_CPPCORE | |||||
| #include <cppcore/conversion/convert_cast.h> | |||||
| #define cppcurl_convert_cast ::cppcore::convert_cast | |||||
| #else | |||||
| #define cppcurl_convert_cast static_cast | |||||
| #endif | |||||
| @@ -26,7 +26,7 @@ namespace cppcurl | |||||
| static inline void write(CURL* handle, CURLoption opt, bool val) | static inline void write(CURL* handle, CURLoption opt, bool val) | ||||
| { | { | ||||
| easy_exception::throw_error( | easy_exception::throw_error( | ||||
| curl_easy_setopt(handle, opt, static_cast<long>(val)), | |||||
| curl_easy_setopt(handle, opt, cppcurl_convert_cast<long>(val)), | |||||
| "Unable to set option on easy handle."); | "Unable to set option on easy handle."); | ||||
| } | } | ||||
| }; | }; | ||||
| @@ -55,7 +55,7 @@ namespace cppcurl | |||||
| { | { | ||||
| os << error_str | os << error_str | ||||
| << '(' | << '(' | ||||
| << static_cast<int>(error) | |||||
| << cppcurl_convert_cast<int>(error) | |||||
| << "): " | << "): " | ||||
| << message; | << message; | ||||
| } | } | ||||
| @@ -63,7 +63,7 @@ namespace cppcurl | |||||
| template<typename T_error> | template<typename T_error> | ||||
| exception<T_error> | exception<T_error> | ||||
| ::exception(T_error err, const std::string& msg) | ::exception(T_error err, const std::string& msg) | ||||
| : _what (__impl::get_error_str<T_error>()(err) + "(" + std::to_string(static_cast<int>(err)) + "): " + msg) | |||||
| : _what (__impl::get_error_str<T_error>()(err) + "(" + std::to_string(cppcurl_convert_cast<int>(err)) + "): " + msg) | |||||
| , error (err) | , error (err) | ||||
| , error_str (__impl::get_error_str<T_error>()(err)) | , error_str (__impl::get_error_str<T_error>()(err)) | ||||
| { } | { } | ||||
| @@ -45,7 +45,7 @@ ForEach ( FILE IN LISTS CPPCURL_TEST_SOURCE_FILES ) | |||||
| # test | # test | ||||
| If ( HAS_CMAKE_TESTS ) | 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 ( ) | Else ( ) | ||||
| Add_Test ( NAME ${TEST_NAME} COMMAND ${TEST_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) | Add_Test ( NAME ${TEST_NAME} COMMAND ${TEST_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) | ||||
| EndIf ( ) | EndIf ( ) | ||||