From 87b20e8dab8421c2d85ce72e7ac270267090cd56 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Wed, 4 Dec 2013 08:12:30 +0000 Subject: [PATCH] SourceLineInfo takes char*s instead of std::strings --- include/internal/catch_common.h | 2 +- include/internal/catch_common.hpp | 2 +- .../CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 650e1fb..957ce25 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -86,7 +86,7 @@ namespace Catch { struct SourceLineInfo { SourceLineInfo(); - SourceLineInfo( std::string const& _file, std::size_t _line ); + SourceLineInfo( char const* _file, std::size_t _line ); SourceLineInfo( SourceLineInfo const& other ); bool empty() const; bool operator == ( SourceLineInfo const& other ) const; diff --git a/include/internal/catch_common.hpp b/include/internal/catch_common.hpp index 4fbf1ff..89ffeab 100644 --- a/include/internal/catch_common.hpp +++ b/include/internal/catch_common.hpp @@ -50,7 +50,7 @@ namespace Catch { } SourceLineInfo::SourceLineInfo() : line( 0 ){} - SourceLineInfo::SourceLineInfo( std::string const& _file, std::size_t _line ) + SourceLineInfo::SourceLineInfo( char const* _file, std::size_t _line ) : file( _file ), line( _line ) {} diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj index c6a13fb..e884823 100644 --- a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj +++ b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj @@ -323,6 +323,7 @@ 4AC91CB4155B9EBF00DC5117 /* impl */ = { isa = PBXGroup; children = ( + 4A6D0C5F149B3E3D00DB3EAA /* catch_section.hpp */, 261488FA184C81130041FBEB /* catch_test_spec.hpp */, 263FD06017AF8DF200988A20 /* catch_timer.hpp */, 266E9AD117230ACF0061DAB2 /* catch_text.hpp */, @@ -350,7 +351,6 @@ 4A6D0C5C149B3E3D00DB3EAA /* catch_result_type.h */, 4A6D0C5D149B3E3D00DB3EAA /* catch_assertionresult.h */, 4A9D84B315599AC900FBB209 /* catch_expressionresult_builder.h */, - 4A6D0C5F149B3E3D00DB3EAA /* catch_section.hpp */, 261488FE184DC32F0041FBEB /* catch_section.h */, 4A3D7DD01503869D005F9203 /* catch_matchers.hpp */, 4A9D84B11558FC0400FBB209 /* catch_tostring.hpp */,