Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Removed const refs from NSString/ NSObject overloads (effectively reapplies PR #855 originally applied to "1.x" master)

Commit
e62a9aa444abff8e309878b26c74d6f5f38b1321
Author
Phil Nash ·
Parents
059a33d55511

Files · Download .tar.gz

Changes

 include/internal/catch_tostring.h   | 10 +++++-----
 include/internal/catch_tostring.hpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h
index 91fa9ed9..2828be1a 100644
--- a/include/internal/catch_tostring.h
+++ b/include/internal/catch_tostring.h
@@ -302,16 +302,16 @@ namespace Catch {
 
 #ifdef __OBJC__
     template<>
-    struct StringMaker<NSString const *> {
-        static std::string convert(NSString const* const& nsstring);
+    struct StringMaker<NSString*> {
+        static std::string convert(NSString* nsstring);
     };
     template<>
-    struct StringMaker<NSString * CATCH_ARC_STRONG> {
-        static std::string convert(NSString * CATCH_ARC_STRONG const& nsstring);
+    struct StringMaker<NSString* CATCH_ARC_STRONG> {
+        static std::string convert(NSString * CATCH_ARC_STRONG nsstring);
     };
     template<>
     struct StringMaker<NSObject *> {
-        static std::string convert(NSObject* const& nsObject);
+        static std::string convert(NSObject* nsObject);
     };
 #endif
 
diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp
index 03881249..d383ba0a 100644
--- a/include/internal/catch_tostring.hpp
+++ b/include/internal/catch_tostring.hpp
@@ -210,17 +210,17 @@ std::string StringMaker<double>::convert(double value) {
 
 
 #ifdef __OBJC__
-std::string StringMaker<NSString const *>::convert(NSString const * const& nsstring) {
+std::string StringMaker<NSString*>::convert(NSString* nsstring) {
     if (!nsstring)
         return "nil";
     return "@" + toString([nsstring UTF8String]);
 }
-std::string StringMaker<NSString * CATCH_ARC_STRONG>::convert(NSString * CATCH_ARC_STRONG const& nsstring) {
+std::string StringMaker<NSString * CATCH_ARC_STRONG>::convert(NSString* CATCH_ARC_STRONG nsstring) {
     if (!nsstring)
         return "nil";
     return "@" + toString([nsstring UTF8String]);
 }
-std::string StringMaker<NSObject *>::convert(NSObject * const& nsObject) {
+std::string StringMaker<NSObject*>::convert(NSObject* nsObject) {
     return ::Catch::Detail::stringify([nsObject description]);
 }
 #endif