eden-emu/Catch2
18
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed errors and warnings on OC project

Browse source
This commit is contained in:
Phil Nash 2018-06-12 13:42:33 +01:00
parent c5301bf8bf
commit 788f81230f
8 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/internal/catch_tostring.cpp
View file

@ -12,11 +12,6 @@
# 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"
@ -229,13 +224,14 @@ 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