- GTMStackTrace works on 10.5+ (and iPhone) using NSThread to build the call stack.

- Added GTM_EXTERN that makes it easier to mix and match objc and objc++ code.

- Added GTMHotKeysTextField for display and editing of hot key settings.

- Added GTMCarbonEvent for dealing with Carbon Events and HotKeys in a ObjC like way.

- Backported the Atomic Barrier Swap functions for Objective C back to Tiger.

- Added a variety of new functions to GTMUnitTestingUtilities for checking if the screensaver is in the way, waiting on user events, and generating  keystrokes.

- If you are using any Carbon routines that log (DebugStr, AssertMacros.h) and use GTMUnitTestDevLog, the log routines now go through _GTMDevLog so that they can be caught in GTMUnitTestDevLog and verified like any _GTMDevLog calls you may make. For an example of this in action see GTMCarbonEventTest.m.

- Added GTMFileSystemKQueue.  It provides a simple wrapper for kqueuing something in the file system and tracking changes to it.

- RunIPhoneUnitTest.sh now cleans up the user home directory and creates a documents directory within it, used when requesting a NSDocumentDirectory.

- Added GTMNSFileManager+Carbon which contains routines for path <-> Alias conversion and path <-> FSRef conversion.

- Added GTMNSArray+Merge for merging one array into another with or without a custom merging function, returning a new array with the merged contents.

1 files changed, 47 insertions, 0 deletions

diff --git a/Foundation/GTMNSArray+Merge.h b/Foundation/GTMNSArray+Merge.h
new file mode 100644
index 0000000..8140f80
--- /dev/null
+++ b/Foundation/GTMNSArray+Merge.h
@@ -0,0 +1,47 @@
+//
+//  GTMNSArray+Merge.h
+//
+//  Copyright 2008 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file 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>
+
+// Extension to NSArray to allow merging of arrays.
+//
+@interface NSArray (GTMNSArrayMergingAdditions)
+
+// Merge our array with |newArray| by sorting each array then merging the
+// two arrays.  If |merger| is provided then call that method on any old
+// items that compare as equal to a new item, passing the new item as
+// the only argument.  If |merger| is not provided, then insert new items
+// in front of matching old items.  If neither array has any items then
+// nil is returned.
+//
+// The signature of the |merger| is:
+//    - (id)merge:(id)newItem;
+//
+// Returns a new, sorted array.
+- (NSArray *)gtm_mergeArray:(NSArray *)newArray
+              mergeSelector:(SEL)merger;
+
+// Same as above, only |comparer| is used to sort/compare the objects, just like
+// -[NSArray sortedArrayUsingSelector].  If |comparer| is nil, nil is returned.
+- (NSArray *)gtm_mergeArray:(NSArray *)newArray
+            compareSelector:(SEL)comparer
+              mergeSelector:(SEL)merger;
+
+@end
+
+