3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reinline some StringMaker impls

Browse Source
This commit is contained in:
Martin Hořeňovský 2020-05-09 21:14:43 +02:00
parent b93cf932fb
commit cb25c4a8a3
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/catch2/catch_tostring.cpp
View File

@ -201,11 +201,6 @@ std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
return rss.str(); return rss.str();
} }
std::string StringMaker<bool>::convert(bool b) {
return b ? "true" : "false";
}
std::string StringMaker<signed char>::convert(signed char value) { std::string StringMaker<signed char>::convert(signed char value) {
if (value == '\r') { if (value == '\r') {
return "'\\r'"; return "'\\r'";
@ -230,10 +225,6 @@ std::string StringMaker<unsigned char>::convert(unsigned char c) {
return ::Catch::Detail::stringify(static_cast<char>(c)); return ::Catch::Detail::stringify(static_cast<char>(c));
} }
std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
return "nullptr";
}
int StringMaker<float>::precision = 5; int StringMaker<float>::precision = 5;
std::string StringMaker<float>::convert(float value) { std::string StringMaker<float>::convert(float value) {

26
src/catch2/catch_tostring.hpp
View File

@ -239,7 +239,10 @@ namespace Catch {
template<> template<>
struct StringMaker<bool> { struct StringMaker<bool> {
static std::string convert(bool b); static std::string convert(bool b) {
using namespace std::string_literals;
return b ? "true"s : "false"s;
}
}; };
template<> template<>
@ -257,7 +260,10 @@ namespace Catch {
template<> template<>
struct StringMaker<std::nullptr_t> { struct StringMaker<std::nullptr_t> {
static std::string convert(std::nullptr_t); static std::string convert(std::nullptr_t) {
using namespace std::string_literals;
return "nullptr"s;
}
}; };
template<> template<>
@ -512,18 +518,14 @@ namespace Catch {
template <class Ratio> template <class Ratio>
struct ratio_string { struct ratio_string {
static std::string symbol(); static std::string symbol() {
Catch::ReusableStringStream rss;
rss << '[' << Ratio::num << '/'
<< Ratio::den << ']';
return rss.str();
}
}; };
template <class Ratio>
std::string ratio_string<Ratio>::symbol() {
Catch::ReusableStringStream rss;
rss << '[' << Ratio::num << '/'
<< Ratio::den << ']';
return rss.str();
}
template <> template <>
struct ratio_string<std::atto> { struct ratio_string<std::atto> {
static std::string symbol() { return "a"; } static std::string symbol() { return "a"; }