mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-30 19:57:10 +01:00 
			
		
		
		
	Fix AssertionPrinter name conflict in console and compact reporters
This commit is contained in:
		 Neal Coombes
					Neal Coombes
				
			
				
					committed by
					
						 Martin Hořeňovský
						Martin Hořeňovský
					
				
			
			
				
	
			
			
			 Martin Hořeňovský
						Martin Hořeňovský
					
				
			
						parent
						
							54fb6f2d23
						
					
				
				
					commit
					61e29b5630
				
			| @@ -30,11 +30,11 @@ namespace Catch { | ||||
| namespace { | ||||
|  | ||||
| // Formatter impl for ConsoleReporter | ||||
| class AssertionPrinter { | ||||
| class ConsoleAssertionPrinter { | ||||
| public: | ||||
|     AssertionPrinter& operator= (AssertionPrinter const&) = delete; | ||||
|     AssertionPrinter(AssertionPrinter const&) = delete; | ||||
|     AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages) | ||||
|     ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete; | ||||
|     ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete; | ||||
|     ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages) | ||||
|         : stream(_stream), | ||||
|         stats(_stats), | ||||
|         result(_stats.assertionResult), | ||||
| @@ -368,7 +368,7 @@ bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) { | ||||
|  | ||||
|     lazyPrint(); | ||||
|  | ||||
|     AssertionPrinter printer(stream, _assertionStats, includeResults); | ||||
|     ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults); | ||||
|     printer.print(); | ||||
|     stream << std::endl; | ||||
|     return true; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user