catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Reverted removal of #ifdef for chrono converters, and fixed in OC project a different way
- Commit
1dce91d78eb6764a474badee7559650502f1d2fc- Author
- Phil Nash ·
- Parents
b8553d62a3a9
Changes
include/internal/catch_tostring.cpp | 7 +++++-- projects/XCode/OCTest/catch_objc_impl.mm | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/internal/catch_tostring.cpp b/include/internal/catch_tostring.cpp index c0d90444..ee6a815f 100644 --- a/include/internal/catch_tostring.cpp +++ b/include/internal/catch_tostring.cpp @@ -12,6 +12,11 @@ # pragma clang diagnostic ignored "-Wglobal-constructors" #endif +// Enable specific decls locally +#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) +#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER +#endif + #include "catch_tostring.h" #include "catch_interfaces_config.h" #include "catch_context.h" @@ -224,14 +229,12 @@ std::string StringMaker<double>::convert(double value) { return fpToString(value, 10); } -#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) std::string ratio_string<std::atto>::symbol() { return "a"; } std::string ratio_string<std::femto>::symbol() { return "f"; } std::string ratio_string<std::pico>::symbol() { return "p"; } std::string ratio_string<std::nano>::symbol() { return "n"; } std::string ratio_string<std::micro>::symbol() { return "u"; } std::string ratio_string<std::milli>::symbol() { return "m"; } -#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER } // end namespace Catch diff --git a/projects/XCode/OCTest/catch_objc_impl.mm b/projects/XCode/OCTest/catch_objc_impl.mm index 08622789..e439a3ab 100644 --- a/projects/XCode/OCTest/catch_objc_impl.mm +++ b/projects/XCode/OCTest/catch_objc_impl.mm @@ -1,6 +1,7 @@ // This file #includes all the .cpp files into a single .mm // - so they get compiled as ObjectiveC++ +#include "../../../include/internal/catch_tostring.cpp" #include "../../../include/internal/catch_approx.cpp" #include "../../../include/internal/catch_assertionhandler.cpp" #include "../../../include/internal/catch_assertionresult.cpp" @@ -52,7 +53,6 @@ #include "../../../include/internal/catch_test_spec.cpp" #include "../../../include/internal/catch_test_spec_parser.cpp" #include "../../../include/internal/catch_timer.cpp" -#include "../../../include/internal/catch_tostring.cpp" #include "../../../include/internal/catch_totals.cpp" #include "../../../include/internal/catch_uncaught_exceptions.cpp" #include "../../../include/internal/catch_version.cpp"