diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp index 78c725ec..d5714e8d 100644 --- a/include/internal/catch_tostring.hpp +++ b/include/internal/catch_tostring.hpp @@ -99,18 +99,15 @@ struct StringMaker { } }; -template -struct StringMaker > { - static std::string convert( std::vector const& v ) { - std::ostringstream oss; - oss << "{ "; - for( std::size_t i = 0; i < v.size(); ++ i ) { - oss << toString( v[i] ); - if( i < v.size() - 1 ) - oss << ", "; - } - oss << " }"; - return oss.str(); +namespace Detail { + template + std::string rangeToString( InputIterator first, InputIterator last ); +} + +template +struct StringMaker > { + static std::string convert( std::vector const& v ) { + return Detail::rangeToString( v.begin(), v.end() ); } }; @@ -230,6 +227,22 @@ inline std::string toString( std::nullptr_t ) { } #endif + namespace Detail { + template + 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 #endif // TWOBLUECUBES_CATCH_TOSTRING_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 523fa088..dba2e304 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* * CATCH v1.0 build 10 (master branch) - * Generated: 2013-09-14 19:56:34.776409 + * 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. @@ -722,18 +722,15 @@ struct StringMaker { } }; -template -struct StringMaker > { - static std::string convert( std::vector const& v ) { - std::ostringstream oss; - oss << "{ "; - for( std::size_t i = 0; i < v.size(); ++ i ) { - oss << toString( v[i] ); - if( i < v.size() - 1 ) - oss << ", "; - } - oss << " }"; - return oss.str(); +namespace Detail { + template + std::string rangeToString( InputIterator first, InputIterator last ); +} + +template +struct StringMaker > { + static std::string convert( std::vector const& v ) { + return Detail::rangeToString( v.begin(), v.end() ); } }; @@ -853,6 +850,22 @@ inline std::string toString( std::nullptr_t ) { } #endif + namespace Detail { + template + 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