Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Replaced 'HIDDEN OBJC_EXPORT' with 'HIDDEN' to fix visibility attribu…

…te conflict errors which manifested when building against the OS X 10.7 or iOS 4.3 SDKs.

git-svn-id: http://dysart.cs.byu.edu/chsvn/trunk@710 a75b6edf-6070-4da8-89c8-9992cc802e51
  • Loading branch information...
commit 060847f190488c2a40c75b8fc351b1b9a7a65ad0 1 parent 5d56b46
@quinntaylor authored
View
2  source/CHAbstractBinarySearchTree_Internal.h
@@ -44,7 +44,7 @@
HIDDEN CHBinaryTreeNode* CHCreateBinaryTreeNodeWithObject(id anObject);
// These are used by subclasses; marked as HIDDEN to reduce external visibility.
-HIDDEN OBJC_EXPORT size_t kCHBinaryTreeNodeSize;
+HIDDEN size_t kCHBinaryTreeNodeSize;
#pragma mark Stack macros
View
2  source/CHMutableDictionary.h
@@ -12,7 +12,7 @@
#import "Util.h"
-HIDDEN OBJC_EXPORT void createCollectableCFMutableDictionary(CFMutableDictionaryRef* dictionary, NSUInteger initialCapacity);
+HIDDEN void createCollectableCFMutableDictionary(CFMutableDictionaryRef* dictionary, NSUInteger initialCapacity);
/**
@file CHMutableDictionary.h
View
10 source/Util.h
@@ -61,7 +61,7 @@ void* __strong NSReallocateCollectable(void *ptr, NSUInteger size, NSUInteger op
#else
// This is declared in <objc/objc-auto.h>, but importing the header is overkill.
-HIDDEN OBJC_EXPORT void* objc_memmove_collectable(void *dst, const void *src, size_t size);
+HIDDEN void* objc_memmove_collectable(void *dst, const void *src, size_t size);
#endif
@@ -71,7 +71,7 @@ HIDDEN OBJC_EXPORT void* objc_memmove_collectable(void *dst, const void *src, si
OBJC_EXPORT BOOL kCHGarbageCollectionNotEnabled;
/** Global variable to store the size of a pointer only once. */
-HIDDEN OBJC_EXPORT size_t kCHPointerSize;
+HIDDEN size_t kCHPointerSize;
/**
Simple function for checking object equality, to be used as a function pointer.
@@ -80,7 +80,7 @@ HIDDEN OBJC_EXPORT size_t kCHPointerSize;
@param o2 The second object to be compared.
@return <code>[o1 isEqual:o2]</code>
*/
-HIDDEN OBJC_EXPORT BOOL objectsAreEqual(id o1, id o2);
+HIDDEN BOOL objectsAreEqual(id o1, id o2);
/**
Simple function for checking object identity, to be used as a function pointer.
@@ -89,7 +89,7 @@ HIDDEN OBJC_EXPORT BOOL objectsAreEqual(id o1, id o2);
@param o2 The second object to be compared.
@return <code>o1 == o2</code>
*/
-HIDDEN OBJC_EXPORT BOOL objectsAreIdentical(id o1, id o2);
+HIDDEN BOOL objectsAreIdentical(id o1, id o2);
/**
Determine whether two collections enumerate the equivalent objects in the same order.
@@ -110,7 +110,7 @@ OBJC_EXPORT BOOL collectionsAreEqual(id collection1, id collection2);
@param o2 The second object to include in the hash.
@return An unsigned integer that can be used as a table address in a hash table structure.
*/
-HIDDEN OBJC_EXPORT NSUInteger hashOfCountAndObjects(NSUInteger count, id o1, id o2);
+HIDDEN NSUInteger hashOfCountAndObjects(NSUInteger count, id o1, id o2);
#pragma mark -
Please sign in to comment.
Something went wrong with that request. Please try again.