Added changes made necessary by #235.

Author: erikdoe

Source/Changes.txt

@@ -5,6 +5,7 @@ OCMock 3.3 (unreleased)
 
 * Made the use of mock objects thread safe. You still have to setup the mocks
   and verify them from a main thread (Ian Anderson)
+* Added modern syntax for reject (Piotr Tobolski)
 
 
 OCMock 3.2.2 (2016-01-20)
@@ -19,7 +20,6 @@ OCMock 3.2.1 (2016-01-13)
 * Disposing dynamically generated subclasses after use (David Stites)
 * Build script now signs frameworks in releases. The signing identity can
   be changed in the script.
-* Added modern syntax for reject (Piotr Tobolski)
 
 
 OCMock 3.2 (2015-10-03)

Source/OCMock/OCMMacroState.m

@@ -64,7 +64,9 @@ + (void)beginRejectMacro
 {
     OCMExpectationRecorder *recorder = [[[OCMExpectationRecorder alloc] init] autorelease];
     [recorder never];
-    globalState = [[[OCMMacroState alloc] initWithRecorder:recorder] autorelease];
+    OCMMacroState *macroState = [[OCMMacroState alloc] initWithRecorder:recorder];
+    [NSThread currentThread].threadDictionary[OCMGlobalStateKey] = macroState;
+    [macroState release];
 }
 
 + (OCMStubRecorder *)endRejectMacro

Source/OCMock/OCMock.h

@@ -70,8 +70,13 @@
 ({ \
     _OCMSilenceWarnings( \
         [OCMMacroState beginRejectMacro]; \
-        invocation; \
-        [OCMMacroState endRejectMacro]; \
+        OCMStubRecorder *recorder = nil; \
+        @try{ \
+            invocation; \
+        }@finally{ \
+            recorder = [OCMMacroState endRejectMacro]; \
+        } \
+        recorder; \
     ); \
 })