Explorar el Código

rename java.internal.Enum to HxEnum to avoid ambiguities

Simon Krajewski hace 10 años
padre
commit
9d336c111d
Se han modificado 2 ficheros con 4 adiciones y 7 borrados
  1. 2 5
      std/java/_std/Reflect.hx
  2. 2 2
      std/java/internal/HxObject.hx

+ 2 - 5
std/java/_std/Reflect.hx

@@ -118,16 +118,13 @@ import java.Boot;
 
 	public static function isObject( v : Dynamic ) : Bool
 	{
-		return v != null && !(Std.is(v, Enum) || Std.is(v, Function) || Std.is(v, java.lang.Enum) || Std.is(v, java.lang.Number) || Std.is(v, java.lang.Boolean));
+		return v != null && !(Std.is(v, HxEnum) || Std.is(v, Function) || Std.is(v, java.lang.Enum) || Std.is(v, java.lang.Number) || Std.is(v, java.lang.Boolean));
 	}
 
 	public static function isEnumValue( v : Dynamic ) : Bool {
-		return v != null && (Std.is(v, Enum) || Std.is(v, java.lang.Enum));
+		return v != null && (Std.is(v, HxEnum) || Std.is(v, java.lang.Enum));
 	}
 
-	//@:functionCode('
-		//return (o instanceof haxe.lang.DynamicObject && ((haxe.lang.DynamicObject) o).__hx_deleteField(field));
-	//')
 	public static function deleteField( o : Dynamic, field : String ) : Bool
 	{
 		return (Std.is(o, DynamicObject) && (o : DynamicObject).__hx_deleteField(field));

+ 2 - 2
std/java/internal/HxObject.hx

@@ -67,7 +67,7 @@ class DynamicObject extends HxObject implements Dynamic
 }
 
 @:keep @:native('haxe.lang.Enum') @:nativeGen
-class Enum
+class HxEnum
 {
 	@:readOnly private var index(default,never):Int;
 
@@ -93,7 +93,7 @@ class Enum
 }
 
 @:keep @:native('haxe.lang.ParamEnum') @:nativeGen
-private class ParamEnum extends Enum
+private class ParamEnum extends HxEnum
 {
 	@:readOnly private var params(default,never):Vector<Dynamic>;