Update OCMock to 3.1.5

third_party/ocmock/OCMock/OCMConstraint.h

Index: third_party/ocmock/OCMock/OCMConstraint.h
diff --git a/third_party/ocmock/OCMock/OCMConstraint.h b/third_party/ocmock/OCMock/OCMConstraint.h
index 3ae1264603843afd648aa98f6d9d2108fe778dab..2164f321befca0dd6e61b08bc80197d390911aaf 100644
--- a/third_party/ocmock/OCMock/OCMConstraint.h
+++ b/third_party/ocmock/OCMock/OCMConstraint.h
@@ -1,22 +1,33 @@
-//---------------------------------------------------------------------------------------
-//  $Id$
-//  Copyright (c) 2007-2010 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
+/*
+ *  Copyright (c) 2007-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>
 
 
 @interface OCMConstraint : NSObject 
 
-+ (id)constraint;
++ (instancetype)constraint;
 - (BOOL)evaluate:(id)value;
 
 // if you are looking for any, isNil, etc, they have moved to OCMArg
 
 // try to use [OCMArg checkWith...] instead of the constraintWith... methods below
 
-+ (id)constraintWithSelector:(SEL)aSelector onObject:(id)anObject;
-+ (id)constraintWithSelector:(SEL)aSelector onObject:(id)anObject withValue:(id)aValue;
++ (instancetype)constraintWithSelector:(SEL)aSelector onObject:(id)anObject;
++ (instancetype)constraintWithSelector:(SEL)aSelector onObject:(id)anObject withValue:(id)aValue;
 
 
 @end
@@ -46,19 +57,15 @@
 
 @end
 
-#if NS_BLOCKS_AVAILABLE
-
 @interface OCMBlockConstraint : OCMConstraint
 {
 	BOOL (^block)(id);
 }
 
-- (id)initWithConstraintBlock:(BOOL (^)(id))block;
+- (instancetype)initWithConstraintBlock:(BOOL (^)(id))block;
 
 @end
 
-#endif
-
 
 #define CONSTRAINT(aSelector) [OCMConstraint constraintWithSelector:aSelector onObject:self]
 #define CONSTRAINTV(aSelector, aValue) [OCMConstraint constraintWithSelector:aSelector onObject:self withValue:(aValue)]