| Index: third_party/ocmock/OCMock/OCMArg.h
|
| diff --git a/third_party/ocmock/OCMock/OCMArg.h b/third_party/ocmock/OCMock/OCMArg.h
|
| old mode 100644
|
| new mode 100755
|
| index 669c094878682b0ff1b0e99a6d5fea9887dfca41..3391c7bbc78e08e1a55d7b7516eb0e9092d24551
|
| --- a/third_party/ocmock/OCMock/OCMArg.h
|
| +++ b/third_party/ocmock/OCMock/OCMArg.h
|
| @@ -1,7 +1,18 @@
|
| -//---------------------------------------------------------------------------------------
|
| -// $Id$
|
| -// Copyright (c) 2009-2010 by Mulle Kybernetik. See License file for details.
|
| -//---------------------------------------------------------------------------------------
|
| +/*
|
| + * Copyright (c) 2009-2015 Erik Doernenburg and contributors
|
| + *
|
| + * Licensed under the Apache License, Version 2.0 (the "License"); you may
|
| + * not use these files except in compliance with the License. You may obtain
|
| + * a copy of the License at
|
| + *
|
| + * http://www.apache.org/licenses/LICENSE-2.0
|
| + *
|
| + * Unless required by applicable law or agreed to in writing, software
|
| + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
| + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
| + * License for the specific language governing permissions and limitations
|
| + * under the License.
|
| + */
|
|
|
| #import <Foundation/Foundation.h>
|
|
|
| @@ -10,18 +21,22 @@
|
| // constraining arguments
|
|
|
| + (id)any;
|
| ++ (SEL)anySelector;
|
| + (void *)anyPointer;
|
| ++ (id __autoreleasing *)anyObjectRef;
|
| + (id)isNil;
|
| + (id)isNotNil;
|
| ++ (id)isEqual:(id)value;
|
| + (id)isNotEqual:(id)value;
|
| ++ (id)isKindOfClass:(Class)cls;
|
| + (id)checkWithSelector:(SEL)selector onObject:(id)anObject;
|
| -#if NS_BLOCKS_AVAILABLE
|
| -+ (id)checkWithBlock:(BOOL (^)(id))block;
|
| -#endif
|
| ++ (id)checkWithBlock:(BOOL (^)(id obj))block;
|
|
|
| // manipulating arguments
|
|
|
| + (id *)setTo:(id)value;
|
| ++ (void *)setToValue:(NSValue *)value;
|
| ++ (id)invokeBlock;
|
|
|
| // internal use only
|
|
|
| @@ -30,4 +45,10 @@
|
| @end
|
|
|
| #define OCMOCK_ANY [OCMArg any]
|
| -#define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(__typeof__(variable))]
|
| +
|
| +#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
| + #define OCMOCK_VALUE(variable) \
|
| + ({ __typeof__(variable) __v = (variable); [NSValue value:&__v withObjCType:@encode(__typeof__(__v))]; })
|
| +#else
|
| + #define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(__typeof__(variable))]
|
| +#endif
|
|
|