cheng/Catch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated single-include version

Browse Source
This commit is contained in:
Andy Sawyer 2013-09-21 19:08:23 +01:00
parent d6f23a9a36
commit 7974e1cb55
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/*
* CATCH v1.0 build 10 (master branch)
* Generated: 2013-09-17 22:21:47.780755
* Generated: 2013-09-21 19:07:52.759646
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -724,18 +724,7 @@ struct StringMaker<T*> {
namespace Detail {
template<typename InputIterator>
std::string rangeToString( InputIterator first, InputIterator last ) {
std::ostringstream oss;
oss << "{ ";
if( first != last ) {
oss << toString( *first );
for( ++first ; first != last ; ++first ) {
oss << ", " << toString( *first );
}
}
oss << " }";
return oss.str();
}
std::string rangeToString( InputIterator first, InputIterator last );
}
template<typename T, typename Allocator>
@ -861,6 +850,22 @@ inline std::string toString( std::nullptr_t ) {
}
#endif
namespace Detail {
template<typename InputIterator>
std::string rangeToString( InputIterator first, InputIterator last ) {
std::ostringstream oss;
oss << "{ ";
if( first != last ) {
oss << toString( *first );
for( ++first ; first != last ; ++first ) {
oss << ", " << toString( *first );
}
}
oss << " }";
return oss.str();
}
}
} // end namespace Catch
// #included from: catch_assertionresult.h