Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-05-09 21:14:43 +0200
committerMartin Hořeňovský2020-05-09 21:26:42 +0200
commitcb25c4a8a3d8857b07f7b87e4879a8a993c47de7 (patch)
tree4082075f7574f1b2bfea0acb6d9b347a4f60bc49 /src
parentb93cf932fb4657ae650f38b5427e01553c7de2e6 (diff)
downloadcatch3-cb25c4a8a3d8857b07f7b87e4879a8a993c47de7.tar.gz
Reinline some StringMaker impls
Diffstat (limited to 'src')
-rw-r--r--src/catch2/catch_tostring.cpp9
-rw-r--r--src/catch2/catch_tostring.hpp26
2 files changed, 14 insertions, 21 deletions
diff --git a/src/catch2/catch_tostring.cpp b/src/catch2/catch_tostring.cpp
index 3a63a598..4eeabbae 100644
--- a/src/catch2/catch_tostring.cpp
+++ b/src/catch2/catch_tostring.cpp
@@ -201,11 +201,6 @@ std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
return rss.str();
}
-
-std::string StringMaker<bool>::convert(bool b) {
- return b ? "true" : "false";
-}
-
std::string StringMaker<signed char>::convert(signed char value) {
if (value == '\r') {
return "'\\r'";
@@ -230,10 +225,6 @@ std::string StringMaker<unsigned char>::convert(unsigned 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;
std::string StringMaker<float>::convert(float value) {
diff --git a/src/catch2/catch_tostring.hpp b/src/catch2/catch_tostring.hpp
index 77f05fe0..04cd84df 100644
--- a/src/catch2/catch_tostring.hpp
+++ b/src/catch2/catch_tostring.hpp
@@ -239,7 +239,10 @@ namespace Catch {
template<>
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<>
@@ -257,7 +260,10 @@ namespace Catch {
template<>
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<>
@@ -512,18 +518,14 @@ namespace Catch {
template <class Ratio>
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 <>
struct ratio_string<std::atto> {
static std::string symbol() { return "a"; }