diff options
| author | Phil Nash | 2012-08-01 08:17:07 +0100 |
|---|---|---|
| committer | Phil Nash | 2012-08-01 08:17:07 +0100 |
| commit | 0dc9e43c02daad6fd09f549db3b7933777b6a4db (patch) | |
| tree | f91073a1be40e631c74c0b47f1439156c1f672ba /include | |
| parent | 61756974d0246b2bba4b030d96e1d4d46982be04 (diff) | |
| download | catch3-0dc9e43c02daad6fd09f549db3b7933777b6a4db.tar.gz | |
Fixed toString for NSString* in Xcode 4.4
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_objc.hpp | 41 | ||||
| -rw-r--r-- | include/internal/catch_objc_arc.hpp | 47 | ||||
| -rw-r--r-- | include/internal/catch_tostring.hpp | 19 |
3 files changed, 69 insertions, 38 deletions
diff --git a/include/internal/catch_objc.hpp b/include/internal/catch_objc.hpp index 36e870e8..d4709acf 100644 --- a/include/internal/catch_objc.hpp +++ b/include/internal/catch_objc.hpp @@ -8,7 +8,8 @@ #ifndef TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED #define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED -#import <Foundation/Foundation.h> +#include "catch_objc_arc.hpp" + #import <objc/runtime.h> #include <string> @@ -18,38 +19,6 @@ // header for non obj-usage #include "internal/catch_test_case_info.hpp" -#ifdef __has_feature -#define CATCH_ARC_ENABLED __has_feature(objc_arc) -#else -#define CATCH_ARC_ENABLED 0 -#endif - -void arcSafeRelease( NSObject* obj ); -id performOptionalSelector( id obj, SEL sel ); - -#if !CATCH_ARC_ENABLED - inline void arcSafeRelease( NSObject* obj ) { - [obj release]; - } - inline id performOptionalSelector( id obj, SEL sel ) { - if( [obj respondsToSelector: sel] ) - return [obj performSelector: sel]; - return nil; - } - #define CATCH_UNSAFE_UNRETAINED -#else - inline void arcSafeRelease( NSObject* ){} - inline id performOptionalSelector( id obj, SEL sel ) { - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Warc-performSelector-leaks" - if( [obj respondsToSelector: sel] ) - return [obj performSelector: sel]; - #pragma clang diagnostic pop - return nil; - } - #define CATCH_UNSAFE_UNRETAINED __unsafe_unretained -#endif - /////////////////////////////////////////////////////////////////////////////// // This protocol is really only here for (self) documenting purposes, since // all its methods are optional. @@ -147,10 +116,6 @@ namespace Catch { return noTestMethods; } - inline std::string toString( NSString* const& nsstring ) { - return std::string( "@\"" ) + [nsstring UTF8String] + "\""; - } - namespace Matchers { namespace Impl { namespace NSStringMatchers { @@ -161,7 +126,7 @@ namespace Catch { arcSafeRelease( m_substr ); } - NSString* m_substr; + NSString* m_substr; }; struct Equals : StringHolder { diff --git a/include/internal/catch_objc_arc.hpp b/include/internal/catch_objc_arc.hpp new file mode 100644 index 00000000..38f4a160 --- /dev/null +++ b/include/internal/catch_objc_arc.hpp @@ -0,0 +1,47 @@ +/* + * Created by Phil on 1/08/2012. + * Copyright 2012 Two Blue Cubes Ltd. All rights reserved. + * + * Distributed under the Boost Software License, Version 1.0. (See accompanying + * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + */ +#ifndef TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED +#define TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED + +#import <Foundation/Foundation.h> + +#ifdef __has_feature +#define CATCH_ARC_ENABLED __has_feature(objc_arc) +#else +#define CATCH_ARC_ENABLED 0 +#endif + +void arcSafeRelease( NSObject* obj ); +id performOptionalSelector( id obj, SEL sel ); + +#if !CATCH_ARC_ENABLED +inline void arcSafeRelease( NSObject* obj ) { + [obj release]; +} +inline id performOptionalSelector( id obj, SEL sel ) { + if( [obj respondsToSelector: sel] ) + return [obj performSelector: sel]; + return nil; +} +#define CATCH_UNSAFE_UNRETAINED +#define CATCH_ARC_STRONG +#else +inline void arcSafeRelease( NSObject* ){} +inline id performOptionalSelector( id obj, SEL sel ) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Warc-performSelector-leaks" + if( [obj respondsToSelector: sel] ) + return [obj performSelector: sel]; +#pragma clang diagnostic pop + return nil; +} +#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained +#define CATCH_ARC_STRONG __strong +#endif + +#endif // TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp index 9b4cf9b3..455e186a 100644 --- a/include/internal/catch_tostring.hpp +++ b/include/internal/catch_tostring.hpp @@ -11,6 +11,10 @@ #include "catch_common.h" #include <sstream> +#ifdef __OBJC__ +#include "catch_objc_arc.hpp" +#endif + namespace Catch { namespace Detail { @@ -131,6 +135,21 @@ inline std::string toString( std::nullptr_t ) { } #endif +#ifdef __OBJC__ + // inline std::string toString( NSString* const& nsstring ) { + // return std::string( "@\"" ) + [nsstring UTF8String] + "\""; + // } + inline std::string toString( NSString const * const& nsstring ) { + return std::string( "@\"" ) + [nsstring UTF8String] + "\""; + } + inline std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) { + return std::string( "@\"" ) + [nsstring UTF8String] + "\""; + } + inline std::string toString( NSObject* const& nsObject ) { + return toString( [nsObject description] ); + } +#endif + } // end namespace Catch #endif // TWOBLUECUBES_CATCH_TOSTRING_HPP_INCLUDED |