From 1c1b447ede1abbccdf308831644f54387920db7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Tue, 3 Jul 2018 09:25:34 +0200 Subject: [PATCH] Properly guard CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER definition --- include/catch.hpp | 4 +++- include/internal/catch_tostring.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/catch.hpp b/include/catch.hpp index 517dbd3d..b4a05845 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -33,7 +33,9 @@ # if defined(CATCH_CONFIG_DISABLE_MATCHERS) # undef CATCH_CONFIG_DISABLE_MATCHERS # endif -# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER +# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) +# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER +# endif #endif #if !defined(CATCH_CONFIG_IMPL_ONLY) diff --git a/include/internal/catch_tostring.cpp b/include/internal/catch_tostring.cpp index ee6a815f..61b29771 100644 --- a/include/internal/catch_tostring.cpp +++ b/include/internal/catch_tostring.cpp @@ -231,8 +231,8 @@ std::string StringMaker::convert(double value) { std::string ratio_string::symbol() { return "a"; } std::string ratio_string::symbol() { return "f"; } -std::string ratio_string::symbol() { return "p"; } -std::string ratio_string::symbol() { return "n"; } +std::string ratio_string::symbol() { return "p"; } +std::string ratio_string::symbol() { return "n"; } std::string ratio_string::symbol() { return "u"; } std::string ratio_string::symbol() { return "m"; }