diff --git a/application/argumentparser.h b/application/argumentparser.h index 54fbe23..5fb68ca 100644 --- a/application/argumentparser.h +++ b/application/argumentparser.h @@ -7,8 +7,8 @@ #include #include #include -#include #include +#include #ifdef CPP_UTILITIES_DEBUG_BUILD #include #endif diff --git a/cmake/modules/TestTarget.cmake b/cmake/modules/TestTarget.cmake index 69adb4a..7e703c5 100644 --- a/cmake/modules/TestTarget.cmake +++ b/cmake/modules/TestTarget.cmake @@ -43,14 +43,18 @@ if (NOT META_NO_CPP_UNIT) if (NOT CPP_UNIT_LIB AND NOT CPP_UNIT_INCLUDE_DIR) find_package(CppUnit CONFIG) if (TARGET CppUnit) - set(CPP_UNIT_LIB CppUnit CACHE STRING "CppUnit target" FORCE) + set(CPP_UNIT_LIB + CppUnit + CACHE STRING "CppUnit target" FORCE) endif () endif () # fall back to find_library if (NOT CPP_UNIT_LIB AND NOT CPP_UNIT_INCLUDE_DIR) find_library(DETECTED_CPP_UNIT_LIB cppunit) - set(CPP_UNIT_LIB "${DETECTED_CPP_UNIT_LIB}" CACHE FILEPATH "CppUnit library" FORCE) + set(CPP_UNIT_LIB + "${DETECTED_CPP_UNIT_LIB}" + CACHE FILEPATH "CppUnit library" FORCE) endif () if (NOT CPP_UNIT_LIB) diff --git a/conversion/stringbuilder.h b/conversion/stringbuilder.h index 05347a4..e8498c1 100644 --- a/conversion/stringbuilder.h +++ b/conversion/stringbuilder.h @@ -266,9 +266,9 @@ template inline StringType argsT * \brief Allows construction of string-tuples via %-operator, eg. string1 % "string2" % string3. */ template , Traits::IsSpecializingAnyOf> - * = nullptr> -constexpr auto operator%(const Tuple &lhs, const StringType &rhs) -> decltype(std::tuple_cat(lhs, std::tuple(rhs))) + Traits::EnableIf, + Traits::IsSpecializingAnyOf> * = nullptr> +constexpr auto operator%(const Tuple &lhs, const StringType &rhs) -> decltype(std::tuple_cat(lhs, std::tuple(rhs))) { return std::tuple_cat(lhs, std::tuple(rhs)); } @@ -276,9 +276,8 @@ constexpr auto operator%(const Tuple &lhs, const StringType &rhs) -> decltype(st /*! * \brief Allows construction of string-tuples via %-operator, eg. string1 % "string2" % string3. */ -template > - * = nullptr > constexpr auto operator%(const Tuple &lhs, const char *rhs) -> decltype(std::tuple_cat(lhs, std::tuple(rhs))) +template > * = nullptr> +constexpr auto operator%(const Tuple &lhs, const char *rhs) -> decltype(std::tuple_cat(lhs, std::tuple(rhs))) { return std::tuple_cat(lhs, std::tuple(rhs)); } @@ -286,7 +285,8 @@ template , std::is_integral> * = nullptr> +template , std::is_integral> * = nullptr> constexpr auto operator%(const Tuple &lhs, IntegralType rhs) -> decltype(std::tuple_cat(lhs, std::tuple(rhs))) { return std::tuple_cat(lhs, std::tuple(rhs)); @@ -298,7 +298,7 @@ constexpr auto operator%(const Tuple &lhs, IntegralType rhs) -> decltype(std::tu template , Traits::IsSpecializationOf> * = nullptr> -constexpr auto operator%(const StringType &lhs, const StringType &rhs) -> decltype(std::tuple(lhs, rhs)) +constexpr auto operator%(const StringType &lhs, const StringType &rhs) -> decltype(std::tuple(lhs, rhs)) { return std::tuple(lhs, rhs); } @@ -309,7 +309,7 @@ constexpr auto operator%(const StringType &lhs, const StringType &rhs) -> declty template , Traits::IsSpecializationOf> * = nullptr> -constexpr auto operator%(const char *lhs, const StringType &rhs) -> decltype(std::tuple(lhs, rhs)) +constexpr auto operator%(const char *lhs, const StringType &rhs) -> decltype(std::tuple(lhs, rhs)) { return std::tuple(lhs, rhs); } @@ -320,7 +320,7 @@ constexpr auto operator%(const char *lhs, const StringType &rhs) -> decltype(std template , Traits::IsSpecializationOf> * = nullptr> -constexpr auto operator%(const StringType &lhs, const char *rhs) -> decltype(std::tuple(lhs, rhs)) +constexpr auto operator%(const StringType &lhs, const char *rhs) -> decltype(std::tuple(lhs, rhs)) { return std::tuple(lhs, rhs); } @@ -331,7 +331,7 @@ constexpr auto operator%(const StringType &lhs, const char *rhs) -> decltype(std template , Traits::IsSpecializationOf> * = nullptr> -constexpr auto operator%(const StringType &lhs, char rhs) -> decltype(std::tuple(lhs, rhs)) +constexpr auto operator%(const StringType &lhs, char rhs) -> decltype(std::tuple(lhs, rhs)) { return std::tuple(lhs, rhs); } @@ -342,7 +342,7 @@ constexpr auto operator%(const StringType &lhs, char rhs) -> decltype(std::tuple template , Traits::IsSpecializationOf> * = nullptr> -constexpr auto operator%(char lhs, const StringType &rhs) -> decltype(std::tuple(lhs, rhs)) +constexpr auto operator%(char lhs, const StringType &rhs) -> decltype(std::tuple(lhs, rhs)) { return std::tuple(lhs, rhs); } diff --git a/conversion/stringconversion.cpp b/conversion/stringconversion.cpp index b2e692f..93847ad 100644 --- a/conversion/stringconversion.cpp +++ b/conversion/stringconversion.cpp @@ -255,9 +255,8 @@ WideStringData convertMultiByteToWide(std::error_code &ec, const char *inputBuff */ WideStringData convertMultiByteToWide(std::error_code &ec, const std::string &inputBuffer) { - return convertMultiByteToWide(ec, inputBuffer.data(), inputBuffer.size() < static_cast(std::numeric_limits::max() - 1) - ? static_cast(inputBuffer.size() + 1) - : -1); + return convertMultiByteToWide(ec, inputBuffer.data(), + inputBuffer.size() < static_cast(std::numeric_limits::max() - 1) ? static_cast(inputBuffer.size() + 1) : -1); } /*!