Merge branch 'master' of https://github.com/gabime/spdlog
This commit is contained in:
		@@ -1,5 +1,4 @@
 | 
				
			|||||||
project(spdlog-utests CXX)
 | 
					project(spdlog-utests CXX)
 | 
				
			||||||
 | 
					 | 
				
			||||||
enable_testing()
 | 
					enable_testing()
 | 
				
			||||||
find_package(Threads REQUIRED)
 | 
					find_package(Threads REQUIRED)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2913,7 +2913,7 @@ namespace Catch {
 | 
				
			|||||||
                for( std::vector<Ptr<Pattern> >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it )
 | 
					                for( std::vector<Ptr<Pattern> >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it )
 | 
				
			||||||
                    if( !(*it)->matches( testCase ) )
 | 
					                    if( !(*it)->matches( testCase ) )
 | 
				
			||||||
                        return false;
 | 
					                        return false;
 | 
				
			||||||
                    return true;
 | 
					                return true;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user