Revision: 648 http://trac.macosforge.org/projects/ruby/changeset/648 Author: lsansonetti@apple.com Date: 2008-10-06 20:50:19 -0700 (Mon, 06 Oct 2008) Log Message: ----------- do not use the auto allocator when creating the ivar dictionaries Modified Paths: -------------- MacRuby/trunk/variable.c Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2008-10-07 02:04:06 UTC (rev 647) +++ MacRuby/trunk/variable.c 2008-10-07 03:50:19 UTC (rev 648) @@ -955,7 +955,7 @@ (CFDictionaryRef)generic_iv_dict, (const void *)obj); } if (obj_dict == NULL) { - obj_dict = CFDictionaryCreateMutable(NULL, 0, NULL, &rb_cfdictionary_value_cb); + obj_dict = CFDictionaryCreateMutable(kCFAllocatorMalloc, 0, NULL, &rb_cfdictionary_value_cb); CFDictionarySetValue(generic_iv_dict, (const void *)obj, (const void *)obj_dict); CFMakeCollectable(obj_dict); @@ -1125,7 +1125,7 @@ && clone_dict != NULL) CFDictionaryRemoveValue(generic_iv_dict, (const void *)clone); - clone_dict = CFDictionaryCreateMutableCopy(NULL, 0, obj_dict); + clone_dict = CFDictionaryCreateMutableCopy(kCFAllocatorMalloc, 0, obj_dict); CFDictionarySetValue(generic_iv_dict, (const void *)clone, (const void *)clone_dict); CFMakeCollectable(clone_dict); @@ -1193,7 +1193,7 @@ } else { if (generic_iv_dict == NULL) { - generic_iv_dict = CFDictionaryCreateMutable(NULL, 0, NULL, &rb_cfdictionary_value_cb); + generic_iv_dict = CFDictionaryCreateMutable(kCFAllocatorMalloc, 0, NULL, &rb_cfdictionary_value_cb); } CFDictionarySetValue(generic_iv_dict, (const void *)mod, (const void *)dict); } @@ -1206,7 +1206,7 @@ dict = rb_class_ivar_dict(mod); if (dict == NULL) { - dict = CFDictionaryCreateMutable(NULL, 0, NULL, &rb_cfdictionary_value_cb); + dict = CFDictionaryCreateMutable(kCFAllocatorMalloc, 0, NULL, &rb_cfdictionary_value_cb); rb_class_ivar_set_dict(mod, dict); CFMakeCollectable(dict); } @@ -1355,7 +1355,7 @@ if (new_ivar) { if (len + 1 == RB_IVAR_ARY_MAX) { CFMutableDictionaryRef tbl; - tbl = CFDictionaryCreateMutable(NULL, 0, NULL, + tbl = CFDictionaryCreateMutable(kCFAllocatorMalloc, 0, NULL, &rb_cfdictionary_value_cb); for (i = 0; i < len; i++)