3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-19 19:25:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge build 27

Browse Source
This commit is contained in:
Malcolm Noyes
2014-03-05 09:30:33 +00:00
parent 0c71bc3eab 1f1ee3c63d
commit 3abcb2038c
7 changed files with 231 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
single_include/catch.hpp
View File

@@ -1,6 +1,6 @@
/*
* CATCH v1.0 build 26 (master branch)
* Generated: 2014-02-21 12:44:35.538000
* CATCH v1.0 build 27 (master branch)
* Generated: 2014-03-05 09:23:26.023000
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -958,7 +958,7 @@ struct CollectConsoleOutput
}; \
}
//#undef CATCH_CONFIG_VARIADIC_MACROS
// #undef CATCH_CONFIG_VARIADIC_MACROS
#ifdef CATCH_CONFIG_VARIADIC_MACROS
@@ -2832,9 +2832,11 @@ namespace Catch {
}
Option& operator= ( Option const& _other ) {
reset();
if( _other )
nullableValue = new( storage ) T( *_other );
if( &_other != this ) {
reset();
if( _other )
nullableValue = new( storage ) T( *_other );
}
return *this;
}
Option& operator = ( T const& _value ) {
@@ -3080,9 +3082,6 @@ namespace Catch
}
//#include "catch_interfaces_registry_hub.h"
//#include "catch_interfaces_config.h"
#include <ostream>
namespace Catch {
@@ -4330,42 +4329,31 @@ namespace Catch {
#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH
// Declare Clara inside the Catch namespace
#define CLICHE_CLARA_OUTER_NAMESPACE Catch
#define STITCH_CLARA_OUTER_NAMESPACE Catch
// #included from: clara.h
// Only use header guard if we are not using an outer namespace
#ifndef CLICHE_CLARA_OUTER_NAMESPACE
# ifdef TWOBLUECUBES_CLARA_H_INCLUDED
# ifndef TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
# define TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
# endif
# else
# define TWOBLUECUBES_CLARA_H_INCLUDED
# endif
#endif
#ifndef TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
#if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OUTER_NAMESPACE)
#ifndef STITCH_CLARA_OUTER_NAMESPACE
#define TWOBLUECUBES_CLARA_H_INCLUDED
#define STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE Clara
// ----------- #included from tbc_text_format.h -----------
#ifndef CLICHE_CLARA_OUTER_NAMESPACE
#define CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE Clara
// #included from: tbc_text_format.h
// Only use header guard if we are not using an outer namespace
#ifndef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
# ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
# ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
# define TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
# endif
# else
# define TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
# endif
#if !defined(TBC_TEXT_FORMAT_H_INCLUDED) || defined(STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE)
#ifndef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
#define TBC_TEXT_FORMAT_H_INCLUDED
#endif
#ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
#include <string>
#include <vector>
#include <sstream>
// Use optional outer namespace
#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
namespace CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
#endif
namespace Tbc {
@@ -4489,24 +4477,27 @@ namespace Tbc {
} // end namespace Tbc
#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
} // end outer namespace
#endif
#endif // TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
#undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
#endif // TBC_TEXT_FORMAT_H_INCLUDED
// ----------- end of #include from tbc_text_format.h -----------
// ........... back in /Users/philnash/Dev/OSS/Clara/srcs/clara.h
#endif
#include <string>
#include <vector>
#undef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
#include <map>
#include <algorithm>
#include <stdexcept>
#include <memory>
// Use optional outer namespace
#ifdef CLICHE_CLARA_OUTER_NAMESPACE
namespace CLICHE_CLARA_OUTER_NAMESPACE {
#ifdef STITCH_CLARA_OUTER_NAMESPACE
namespace STITCH_CLARA_OUTER_NAMESPACE {
#endif
namespace Clara {
@@ -4782,7 +4773,7 @@ namespace Clara {
}
void validate() const {
if( boundField.takesArg() && !takesArg() )
throw std::logic_error( dbgName() + " must specify an arg name" );
throw std::logic_error( "command line argument '" + dbgName() + "' must specify a hint" );
}
std::string commands() const {
std::ostringstream oss;
@@ -4833,8 +4824,10 @@ namespace Clara {
{
other.m_cl = NULL;
}
~ArgBinder() {
if( m_cl ) {
// !TBD: Need to include workarounds to be able to declare this
// destructor as able to throw exceptions
~ArgBinder() /* noexcept(false) */ {
if( m_cl && !std::uncaught_exception() ) {
m_arg.validate();
if( m_arg.isFixedPositional() ) {
m_cl->m_positionalArgs.insert( std::make_pair( m_arg.position, m_arg ) );
@@ -4979,6 +4972,12 @@ namespace Clara {
return oss.str();
}
ConfigT parseInto( int argc, char const * const * argv ) const {
ConfigT config;
parseInto( argc, argv, config );
return config;
}
std::vector<Parser::Token> parseInto( int argc, char const * const * argv, ConfigT& config ) const {
std::string processName = argv[0];
std::size_t lastSlash = processName.find_last_of( "/\\" );
@@ -5089,13 +5088,12 @@ namespace Clara {
} // end namespace Clara
#ifdef CLICHE_CLARA_OUTER_NAMESPACE
#ifdef STITCH_CLARA_OUTER_NAMESPACE
} // end outer namespace
#endif
#endif // TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
#undef CLICHE_CLARA_OUTER_NAMESPACE
#endif // TWOBLUECUBES_CLARA_H_INCLUDED
#undef STITCH_CLARA_OUTER_NAMESPACE
#include <fstream>
@@ -7492,7 +7490,7 @@ namespace Catch {
// These numbers are maintained by a script
template <typename T>
const T LibraryVersionInfo<T>::value( 1, 0, 26, "master" );
const T LibraryVersionInfo<T>::value( 1, 0, 27, "master" );
}
// #included from: catch_message.hpp