Index: third_party/ocmock/OCMock/OCMBlockCaller.m |
diff --git a/third_party/ocmock/OCMock/OCMBlockCaller.m b/third_party/ocmock/OCMock/OCMBlockCaller.m |
old mode 100644 |
new mode 100755 |
index 439d885d37f58e82390e209fa45fbc4e9f9a689f..b804edd83afb591e6162a8b0ed1a19813e58cfd9 |
--- a/third_party/ocmock/OCMock/OCMBlockCaller.m |
+++ b/third_party/ocmock/OCMock/OCMBlockCaller.m |
@@ -1,18 +1,31 @@ |
-//--------------------------------------------------------------------------------------- |
-// $Id$ |
-// Copyright (c) 2010 by Mulle Kybernetik. See License file for details. |
-//--------------------------------------------------------------------------------------- |
+/* |
+ * Copyright (c) 2010-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 "OCMBlockCaller.h" |
-#if NS_BLOCKS_AVAILABLE |
@implementation OCMBlockCaller |
-(id)initWithCallBlock:(void (^)(NSInvocation *))theBlock |
{ |
- self = [super init]; |
- block = [theBlock copy]; |
+ if ((self = [super init])) |
+ { |
+ block = [theBlock copy]; |
+ } |
+ |
return self; |
} |
@@ -24,9 +37,10 @@ |
- (void)handleInvocation:(NSInvocation *)anInvocation |
{ |
- block(anInvocation); |
+ if (block != nil) |
+ { |
+ block(anInvocation); |
+ } |
} |
@end |
- |
-#endif |