@@ -14,56 +14,13 @@ * file. */ #import "OFDictionary.h" -struct of_dictionary_hashtable_bucket -{ - id key, object; - uint32_t hash; -}; +@class OFMapTable; +@class OFMapTableEnumerator; @interface OFDictionary_hashtable: OFDictionary { - struct of_dictionary_hashtable_bucket **data; - uint32_t size; - size_t count; -} - -#if defined(OF_SET_M) || defined(OF_COUNTED_SET_M) || \ - defined(OF_SET_HASHTABLE_M) || defined(OF_COUNTED_SET_HASHTABLE_M) -- OF_initWithDictionary: (OFDictionary*)dictionary - copyKeys: (BOOL)copyKeys; -#endif -@end - -@interface OFDictionaryEnumerator_hashtable: OFEnumerator -{ - OFDictionary_hashtable *dictionary; - struct of_dictionary_hashtable_bucket **data; - uint32_t size; - unsigned long mutations; - unsigned long *mutationsPtr; - uint32_t pos; -} - -- initWithDictionary: (OFDictionary_hashtable*)dictionary - data: (struct of_dictionary_hashtable_bucket**)data - size: (uint32_t)size - mutationsPointer: (unsigned long*)mutationsPtr; -@end - -@interface OFDictionaryKeyEnumerator_hashtable: OFDictionaryEnumerator_hashtable -@end - -@interface OFDictionaryObjectEnumerator_hashtable: - OFDictionaryEnumerator_hashtable -@end - -#ifdef __cplusplus -extern "C" { -#endif -extern struct of_dictionary_hashtable_bucket - of_dictionary_hashtable_deleted_bucket; -#ifdef __cplusplus -} -#endif + OFMapTable *mapTable; +} +@end