diff options
| author | Phil Nash | 2017-06-11 23:06:38 +0100 |
|---|---|---|
| committer | GitHub | 2017-06-11 23:06:38 +0100 |
| commit | 004228efb2ccbd2f69eb443933507012fa82304c (patch) | |
| tree | 6c46a7a6118eae24df6e04c736d9ee4024bba8c1 /include/internal | |
| parent | e0aaba6cf84c2e932c9a87dd26263875628c4c4f (diff) | |
| parent | e8b31108d695f996998d2abe143e63ef394f9a79 (diff) | |
| download | catch3-004228efb2ccbd2f69eb443933507012fa82304c.tar.gz | |
Merge pull request #855 from kainjow/objc-tostring-link
Fix Catch::toString() linker error when main() is compiled as C++
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/catch_tostring.h | 2 | ||||
| -rw-r--r-- | 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 21ab99a0..93b93c4d 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]); |