diff options
| author | Stuart Dootson | 2019-07-13 13:47:56 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-07-13 14:47:56 +0200 |
| commit | 87739ad3feed09ba0284731cacaed14def894aff (patch) | |
| tree | a5e42bebf73ac1341a76ab1a14516dbeb74cc909 /include | |
| parent | 0c27554af52b8fd0e6c9972326096a1b00e1e7bf (diff) | |
| download | catch3-87739ad3feed09ba0284731cacaed14def894aff.tar.gz | |
Add `std::byte` stringification support (#1686)
* Add `std::byte` support
1. Add byte detection in Catch config
2. Add a `std::byte`specialisation for Catch2::Detail::StringMaker
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_compiler_capabilities.h | 13 | ||||
| -rw-r--r-- | include/internal/catch_tostring.cpp | 6 | ||||
| -rw-r--r-- | include/internal/catch_tostring.h | 6 |
3 files changed, 25 insertions, 0 deletions
diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index b094c68b..ff0053cb 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -202,6 +202,14 @@ #endif // __has_include //////////////////////////////////////////////////////////////////////////////// +// Check if byte is available and usable +#if defined(__has_include) +# if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER) +# define CATCH_INTERNAL_CONFIG_CPP17_BYTE +# endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER) +#endif // __has_include + +//////////////////////////////////////////////////////////////////////////////// // Check if variant is available and usable #if defined(__has_include) # if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER) @@ -256,6 +264,11 @@ # define CATCH_CONFIG_CPP17_VARIANT #endif +#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE) +# define CATCH_CONFIG_CPP17_BYTE +#endif + + #if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) # define CATCH_INTERNAL_CONFIG_NEW_CAPTURE #endif diff --git a/include/internal/catch_tostring.cpp b/include/internal/catch_tostring.cpp index f59676e7..2f66f49d 100644 --- a/include/internal/catch_tostring.cpp +++ b/include/internal/catch_tostring.cpp @@ -170,6 +170,12 @@ std::string StringMaker<wchar_t *>::convert(wchar_t * str) { } #endif +#if defined(CATCH_CONFIG_CPP17_BYTE) +#include <cstddef> +std::string StringMaker<std::byte>::convert(std::byte value) { + return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value)); +} +#endif // defined(CATCH_CONFIG_CPP17_BYTE) std::string StringMaker<int>::convert(int value) { return ::Catch::Detail::stringify(static_cast<long long>(value)); diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h index cb248ea9..b9f9cd9c 100644 --- a/include/internal/catch_tostring.h +++ b/include/internal/catch_tostring.h @@ -210,6 +210,12 @@ namespace Catch { } }; +#if defined(CATCH_CONFIG_CPP17_BYTE) + template<> + struct StringMaker<std::byte> { + static std::string convert(std::byte value); + }; +#endif // defined(CATCH_CONFIG_CPP17_BYTE) template<> struct StringMaker<int> { static std::string convert(int value); |