3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove C++98 backcompat from toString

This commit is contained in:
Martin Hořeňovský 2017-04-25 11:21:22 +02:00
parent 7c900660ef
commit c6980ec2d8
2 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
include/internal/catch_tostring.h
View File

@ -20,13 +20,9 @@
#include "catch_objc_arc.hpp" #include "catch_objc_arc.hpp"
#endif #endif
#ifdef CATCH_CONFIG_CPP11_TUPLE
#include <tuple> #include <tuple>
#endif
#ifdef CATCH_CONFIG_CPP11_IS_ENUM
#include <type_traits> #include <type_traits>
#endif
namespace Catch { namespace Catch {
@ -52,14 +48,10 @@ std::string toString( char value );
std::string toString( signed char value ); std::string toString( signed char value );
std::string toString( unsigned char value ); std::string toString( unsigned char value );
#ifdef CATCH_CONFIG_CPP11_LONG_LONG
std::string toString( long long value ); std::string toString( long long value );
std::string toString( unsigned long long value ); std::string toString( unsigned long long value );
#endif
#ifdef CATCH_CONFIG_CPP11_NULLPTR
std::string toString( std::nullptr_t ); std::string toString( std::nullptr_t );
#endif
#ifdef __OBJC__ #ifdef __OBJC__
std::string toString( NSString const * const& nsstring ); std::string toString( NSString const * const& nsstring );
@ -72,26 +64,6 @@ namespace Detail {
extern const std::string unprintableString; extern const std::string unprintableString;
#if !defined(CATCH_CONFIG_CPP11_STREAM_INSERTABLE_CHECK)
struct BorgType {
template<typename T> BorgType( T const& );
};
struct TrueType { char sizer[1]; };
struct FalseType { char sizer[2]; };
TrueType& testStreamable( std::ostream& );
FalseType testStreamable( FalseType );
FalseType operator<<( std::ostream const&, BorgType const& );
template<typename T>
struct IsStreamInsertable {
static std::ostream &s;
static T const&t;
enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) };
};
#else
template<typename T> template<typename T>
class IsStreamInsertable { class IsStreamInsertable {
template<typename SS, typename TT> template<typename SS, typename TT>
@ -104,9 +76,8 @@ namespace Detail {
public: public:
static const bool value = decltype(test<std::ostream,const T&>(0))::value; static const bool value = decltype(test<std::ostream,const T&>(0))::value;
}; };
#endif
#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
template<typename T, template<typename T,
bool IsEnum = std::is_enum<T>::value bool IsEnum = std::is_enum<T>::value
> >
@ -125,19 +96,14 @@ namespace Detail {
); );
} }
}; };
#endif
template<bool C> template<bool C>
struct StringMakerBase { struct StringMakerBase {
#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
template<typename T> template<typename T>
static std::string convert( T const& v ) static std::string convert( T const& v )
{ {
return EnumStringMaker<T>::convert( v ); return EnumStringMaker<T>::convert( v );
} }
#else
template<typename T>
static std::string convert( T const& ) { return unprintableString; }
#endif
}; };
template<> template<>
@ -202,7 +168,6 @@ std::string toString( std::vector<T,Allocator> const& v ) {
} }
#ifdef CATCH_CONFIG_CPP11_TUPLE
// toString for tuples // toString for tuples
namespace TupleDetail { namespace TupleDetail {
@ -242,7 +207,7 @@ struct StringMaker<std::tuple<Types...>> {
return os.str(); return os.str();
} }
}; };
#endif // CATCH_CONFIG_CPP11_TUPLE
namespace Detail { namespace Detail {
template<typename T> template<typename T>

4
include/internal/catch_tostring.hpp
View File

@ -169,7 +169,6 @@ std::string toString( unsigned char value ) {
return toString( static_cast<char>( value ) ); return toString( static_cast<char>( value ) );
} }
#ifdef CATCH_CONFIG_CPP11_LONG_LONG
std::string toString( long long value ) { std::string toString( long long value ) {
std::ostringstream oss; std::ostringstream oss;
oss << value; oss << value;
@ -184,13 +183,10 @@ std::string toString( unsigned long long value ) {
oss << " (0x" << std::hex << value << ')'; oss << " (0x" << std::hex << value << ')';
return oss.str(); return oss.str();
} }
#endif
#ifdef CATCH_CONFIG_CPP11_NULLPTR
std::string toString( std::nullptr_t ) { std::string toString( std::nullptr_t ) {
return "nullptr"; return "nullptr";
} }
#endif
#ifdef __OBJC__ #ifdef __OBJC__
std::string toString( NSString const * const& nsstring ) { std::string toString( NSString const * const& nsstring ) {