mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-04 05:09:53 +01:00
Fix AssertionPrinter name conflict in console and compact reporters
This commit is contained in:
parent
54fb6f2d23
commit
61e29b5630
@ -30,11 +30,11 @@ namespace Catch {
|
|||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
// Formatter impl for ConsoleReporter
|
// Formatter impl for ConsoleReporter
|
||||||
class AssertionPrinter {
|
class ConsoleAssertionPrinter {
|
||||||
public:
|
public:
|
||||||
AssertionPrinter& operator= (AssertionPrinter const&) = delete;
|
ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
|
||||||
AssertionPrinter(AssertionPrinter const&) = delete;
|
ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
|
||||||
AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
|
ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
|
||||||
: stream(_stream),
|
: stream(_stream),
|
||||||
stats(_stats),
|
stats(_stats),
|
||||||
result(_stats.assertionResult),
|
result(_stats.assertionResult),
|
||||||
@ -368,7 +368,7 @@ bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
|
|||||||
|
|
||||||
lazyPrint();
|
lazyPrint();
|
||||||
|
|
||||||
AssertionPrinter printer(stream, _assertionStats, includeResults);
|
ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
|
||||||
printer.print();
|
printer.print();
|
||||||
stream << std::endl;
|
stream << std::endl;
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user