haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

⬆️ Catch v1.5.9

pull/410/head
Niels Lohmann 2016-12-22 09:37:15 +01:00
parent 22a6b956e8
commit 048330b14b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/thirdparty/catch/catch.hpp vendored 100644 → 100755
View File

@ -1,6 +1,6 @@
/*
* Catch v1.5.8
* Generated: 2016-10-26 12:07:30.938259
* Catch v1.5.9
* Generated: 2016-11-29 12:14:38.049276
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -3428,6 +3428,7 @@ namespace Catch {
#include <streambuf>
#include <ostream>
#include <fstream>
#include <memory>
namespace Catch {
@ -3995,9 +3996,12 @@ namespace Clara {
inline void convertInto( std::string const& _source, std::string& _dest ) {
_dest = _source;
}
char toLowerCh(char c) {
return static_cast<char>( ::tolower( c ) );
}
inline void convertInto( std::string const& _source, bool& _dest ) {
std::string sourceLC = _source;
std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), ::tolower );
std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), toLowerCh );
if( sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on" )
_dest = true;
else if( sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off" )
@ -7578,7 +7582,7 @@ namespace Catch {
return os;
}
Version libraryVersion( 1, 5, 8, "", 0 );
Version libraryVersion( 1, 5, 9, "", 0 );
}
@ -9166,6 +9170,7 @@ namespace Catch {
public:
XmlReporter( ReporterConfig const& _config )
: StreamingReporterBase( _config ),
m_xml(_config.stream()),
m_sectionDepth( 0 )
{
m_reporterPrefs.shouldRedirectStdOut = true;
@ -9185,7 +9190,6 @@ namespace Catch {
virtual void testRunStarting( TestRunInfo const& testInfo ) CATCH_OVERRIDE {
StreamingReporterBase::testRunStarting( testInfo );
m_xml.setStream( stream );
m_xml.startElement( "Catch" );
if( !m_config->name().empty() )
m_xml.writeAttribute( "name", m_config->name() );