3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 07:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #855 from kainjow/objc-tostring-link

Browse Source 
Fix Catch::toString() linker error when main() is compiled as C++
This commit is contained in:
Phil Nash 2017-06-11 23:06:38 +01:00 committed by GitHub
commit 004228efb2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_tostring.h
View File

@ -63,7 +63,7 @@ std::string toString( std::nullptr_t );
#ifdef __OBJC__ #ifdef __OBJC__
std::string toString( NSString const * const& nsstring ); 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 ); std::string toString( NSObject* const& nsObject );
#endif #endif

2
include/internal/catch_tostring.hpp
View File

@ -198,7 +198,7 @@ std::string toString( std::nullptr_t ) {
return "nil"; return "nil";
return "@" + toString([nsstring UTF8String]); return "@" + toString([nsstring UTF8String]);
} }
std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) { std::string toString( NSString * CATCH_ARC_STRONG & nsstring ) {
if( !nsstring ) if( !nsstring )
return "nil"; return "nil";
return "@" + toString([nsstring UTF8String]); return "@" + toString([nsstring UTF8String]);