forked from catchorg/Catch2
Fixed issues for ObjC use (see #1011)
This commit is contained in:
@@ -30,7 +30,7 @@ namespace Catch {
|
||||
return tryTranslators();
|
||||
}
|
||||
@catch (NSException *exception) {
|
||||
return Catch::toString( [exception description] );
|
||||
return Catch::Detail::stringify( [exception description] );
|
||||
}
|
||||
#else
|
||||
return tryTranslators();
|
||||
|
@@ -17,6 +17,8 @@
|
||||
#include <cfloat>
|
||||
#include <cstdio>
|
||||
|
||||
namespace Catch {
|
||||
|
||||
namespace {
|
||||
std::size_t makeRatio( std::size_t number, std::size_t total ) {
|
||||
std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number/ total : 0;
|
||||
@@ -186,9 +188,7 @@ namespace {
|
||||
return os << duration.value() << " " << duration.unitsAsString();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
namespace Catch {
|
||||
} // end anon namespace
|
||||
|
||||
struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
|
||||
TablePrinter m_tablePrinter;
|
||||
|
Reference in New Issue
Block a user