3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix template args to avoid conversion warnings 

Fix avoids a warning about sign conversion when included from a file compiled with -Werror=sign-conversion.
This commit is contained in:
SketchyLizard 2021-11-17 09:01:12 -05:00 committed by Martin Hořeňovský
parent fabe614ba8
commit 2db1cf3404
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/catch2/catch_tostring.hpp
View File

@ -205,7 +205,7 @@ namespace Catch {
};
#endif // CATCH_CONFIG_WCHAR
template<int SZ>
template<size_t SZ>
struct StringMaker<char[SZ]> {
static std::string convert(char const* str) {
// Note that `strnlen` is not actually part of standard C++,
@ -214,7 +214,7 @@ namespace Catch {
StringRef( str, strnlen( str, SZ ) ) );
}
};
template<int SZ>
template<size_t SZ>
struct StringMaker<signed char[SZ]> {
static std::string convert(signed char const* str) {
// See the plain `char const*` overload
@ -223,7 +223,7 @@ namespace Catch {
StringRef(reinterpreted, strnlen(reinterpreted, SZ)));
}
};
template<int SZ>
template<size_t SZ>
struct StringMaker<unsigned char[SZ]> {
static std::string convert(unsigned char const* str) {
// See the plain `char const*` overload
@ -522,7 +522,7 @@ namespace Catch {
}
};
template <typename T, int SZ>
template <typename T, size_t SZ>
struct StringMaker<T[SZ]> {
static std::string convert(T const(&arr)[SZ]) {
return rangeToString(arr);