From e8b31108d695f996998d2abe143e63ef394f9a79 Mon Sep 17 00:00:00 2001 From: Kevin Wojniak Date: Tue, 14 Mar 2017 11:54:14 -0700 Subject: [PATCH] Fix Catch::toString() linker error when main() is compiled as C++ Fixes #278 --- include/internal/catch_tostring.h | 2 +- include/internal/catch_tostring.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h index e6f7ec9d..1e89af79 100644 --- a/include/internal/catch_tostring.h +++ b/include/internal/catch_tostring.h @@ -63,7 +63,7 @@ std::string toString( std::nullptr_t ); #ifdef __OBJC__ std::string toString( NSString const * const& nsstring ); - std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ); + std::string toString( NSString * CATCH_ARC_STRONG & nsstring ); std::string toString( NSObject* const& nsObject ); #endif diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp index e61191b9..602e639d 100644 --- a/include/internal/catch_tostring.hpp +++ b/include/internal/catch_tostring.hpp @@ -198,7 +198,7 @@ std::string toString( std::nullptr_t ) { return "nil"; return "@" + toString([nsstring UTF8String]); } - std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) { + std::string toString( NSString * CATCH_ARC_STRONG & nsstring ) { if( !nsstring ) return "nil"; return "@" + toString([nsstring UTF8String]);