Removed direct use of ->isa and replaced with object_getClass()

Jonathan Mitchell · Jonathan Mitchell · commit bebf3b26f833 · 2012-11-26T17:48:02.000Z
diff --git a/FScriptFramework/FSArray.m b/FScriptFramework/FSArray.m
@@ -148,7 +148,7 @@ - (void)addObject:(id)anObject
   {
   case DOUBLE:
   {
-    if (anObject && ((struct {Class isa;} *)anObject)->isa == FSNumberClass)   // anObject is casted to avoid the warning "static access to object of type id"
+    if (anObject && object_getClass(anObject) == FSNumberClass)   // anObject is casted to avoid the warning "static access to object of type id"
       [(ArrayRepDouble *)rep addDouble:((FSNumber *)anObject)->value ];
     else if (anObject && isNSNumberWithLosslessConversionToDouble(anObject)) 
       [(ArrayRepDouble *)rep addDouble:[(NSNumber *)anObject doubleValue]];
@@ -627,7 +627,7 @@ - (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject
   
   if (type == DOUBLE)
   {
-    if (anObject && ((struct {Class isa;} *)anObject)->isa == FSNumberClass)   // anObject is casted to avoid the warning "static access to object of type id"
+    if (anObject && object_getClass(anObject) == FSNumberClass)   // anObject is casted to avoid the warning "static access to object of type id"
       [(ArrayRepDouble *)rep replaceDoubleAtIndex:index withDouble:((FSNumber *)anObject)->value];
     else if (anObject && isNSNumberWithLosslessConversionToDouble(anObject)) 
       [(ArrayRepDouble *)rep replaceDoubleAtIndex:index withDouble:[anObject doubleValue]];

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ - (void)addObject:(id)anObject`
`148`	`148`	`{`
`149`	`149`	`case DOUBLE:`
`150`	`150`	`{`
`151`		`- if (anObject && ((struct {Class isa;} *)anObject)->isa == FSNumberClass) // anObject is casted to avoid the warning "static access to object of type id"`
	`151`	`+ if (anObject && object_getClass(anObject) == FSNumberClass) // anObject is casted to avoid the warning "static access to object of type id"`
`152`	`152`	`[(ArrayRepDouble )rep addDouble:((FSNumber )anObject)->value ];`
`153`	`153`	`else if (anObject && isNSNumberWithLosslessConversionToDouble(anObject))`
`154`	`154`	`[(ArrayRepDouble )rep addDouble:[(NSNumber )anObject doubleValue]];`
`@@ -627,7 +627,7 @@ - (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject`
`627`	`627`
`628`	`628`	`if (type == DOUBLE)`
`629`	`629`	`{`
`630`		`- if (anObject && ((struct {Class isa;} *)anObject)->isa == FSNumberClass) // anObject is casted to avoid the warning "static access to object of type id"`
	`630`	`+ if (anObject && object_getClass(anObject) == FSNumberClass) // anObject is casted to avoid the warning "static access to object of type id"`
`631`	`631`	`[(ArrayRepDouble )rep replaceDoubleAtIndex:index withDouble:((FSNumber )anObject)->value];`
`632`	`632`	`else if (anObject && isNSNumberWithLosslessConversionToDouble(anObject))`
`633`	`633`	`[(ArrayRepDouble *)rep replaceDoubleAtIndex:index withDouble:[anObject doubleValue]];`