@@ -38,11 +38,11 @@ dictionary = [OFDictionary_hashtable class]; [self inheritMethodsFromClass: dictionary]; } } -- (void)_resizeForCount: (size_t)newCount +- (void)OF_resizeForCount: (size_t)newCount { size_t fullness = newCount * 4 / size; struct of_dictionary_hashtable_bucket **newData; uint32_t i, newSize; @@ -95,13 +95,13 @@ [self freeMemory: data]; data = newData; size = newSize; } -- (void)_setObject: (id)object - forKey: (id)key - copyKey: (BOOL)copyKey +- (void)OF_setObject: (id)object + forKey: (id)key + copyKey: (BOOL)copyKey { uint32_t i, hash, last; id old; if (key == nil || object == nil) @@ -136,11 +136,11 @@ /* Key not in dictionary */ if (i >= last || data[i] == NULL || data[i] == DELETED || ![data[i]->key isEqual: key]) { struct of_dictionary_hashtable_bucket *bucket; - [self _resizeForCount: count + 1]; + [self OF_resizeForCount: count + 1]; mutations++; last = size; for (i = hash & (size - 1); i < last && data[i] != NULL && @@ -185,13 +185,13 @@ } - (void)setObject: (id)object forKey: (id)key { - [self _setObject: object - forKey: key - copyKey: YES]; + [self OF_setObject: object + forKey: key + copyKey: YES]; } - (void)removeObjectForKey: (id)key { uint32_t i, hash, last; @@ -214,11 +214,11 @@ [self freeMemory: data[i]]; data[i] = DELETED; count--; mutations++; - [self _resizeForCount: count]; + [self OF_resizeForCount: count]; return; } } @@ -238,11 +238,11 @@ [self freeMemory: data[i]]; data[i] = DELETED; count--; mutations++; - [self _resizeForCount: count]; + [self OF_resizeForCount: count]; return; } } }