move up ClassMap to avoid UtilsObjectMap taking over precedence

innogames · Oct 22, 2020 · b6647c2 · b6647c2
1 parent aa9dd5b
commit b6647c2
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/openfl/utils/Dictionary.hx b/src/openfl/utils/Dictionary.hx
@@ -57,6 +57,10 @@ abstract Dictionary<K, V>(IMap<K, V>) {
 		return new EnumValueMap<K, V>();
 	}
 
+	@:to static function toClassMap<K:Class<Dynamic>, V>(t:IMap<K, V>, weakKeys:Bool):ClassMap<K, V> {
+		return new ClassMap<K, V>();
+	}
+
 	@:to static function toObjectMap<K:{}, V>(t:IMap<K, V>, weakKeys:Bool):ObjectMap<K, V> {
 		return new ObjectMap<K, V>();
 	}
@@ -65,10 +69,6 @@ abstract Dictionary<K, V>(IMap<K, V>) {
 		return new UtilsObjectMap<K, V>();
 	}
 
-	@:to static function toClassMap<K:Class<Dynamic>, V>(t:IMap<K, V>, weakKeys:Bool):ClassMap<K, V> {
-		return new ClassMap<K, V>();
-	}
-
 	@:from static inline function fromStringMap<V>(map:StringMap<V>):Dictionary<String, V> {
 		return cast map;
 	}
@@ -81,15 +81,15 @@ abstract Dictionary<K, V>(IMap<K, V>) {
 		return cast map;
 	}
 
-	@:from static inline function fromObjectMap<K:{}, V>(map:ObjectMap<K, V>):Dictionary<K, V> {
+	@:from static inline function fromClassMap<K:Class<Dynamic>, V>(map:ClassMap<K, V>):Dictionary<K, V> {
 		return cast map;
 	}
 
-	@:from static inline function fromUtilsObjectMap<K:Object, V>(map:UtilsObjectMap<K, V>):Dictionary<K, V> {
+	@:from static inline function fromObjectMap<K:{}, V>(map:ObjectMap<K, V>):Dictionary<K, V> {
 		return cast map;
 	}
 
-	@:from static inline function fromClassMap<K:Class<Dynamic>, V>(map:ClassMap<K, V>):Dictionary<K, V> {
+	@:from static inline function fromUtilsObjectMap<K:Object, V>(map:UtilsObjectMap<K, V>):Dictionary<K, V> {
 		return cast map;
 	}
 }