From 7974e1cb557e75e81f85bf3160b30d312f59089f Mon Sep 17 00:00:00 2001 From: Andy Sawyer Date: Sat, 21 Sep 2013 19:08:23 +0100 Subject: [PATCH] updated single-include version --- single_include/catch.hpp | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 00dd9fc..dba2e30 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-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 { 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(); - } + std::string rangeToString( InputIterator first, InputIterator last ); } template @@ -861,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