Browse Source

[cpp] Fix map macro for scriptable case

Hugh 8 years ago
parent
commit
56512631f4

+ 4 - 4
std/cpp/_std/haxe/ds/IntMap.hx

@@ -94,10 +94,10 @@ package haxe.ds;
 	}
 
    #if (scriptable)
-   private function setString(key:Int,val:String) : Void { untyped __int_hash_set_string(HX_MAP_THIS,key,val); }
-   private function setInt(key:Int,val:Int) : Void { untyped __int_hash_set_int(HX_MAP_THIS,key,val); }
-   private function setBool(key:Int,val:Bool) : Void { untyped __int_hash_set_int(HX_MAP_THIS,key,val); }
-   private function setFloat(key:Int,val:Float) : Void { untyped __int_hash_set_float(HX_MAP_THIS,key,val); }
+   private function setString(key:Int,val:String) : Void { untyped __int_hash_set_string(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setInt(key:Int,val:Int) : Void { untyped __int_hash_set_int(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setBool(key:Int,val:Bool) : Void { untyped __int_hash_set_int(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setFloat(key:Int,val:Float) : Void { untyped __int_hash_set_float(__cpp__("HX_MAP_THIS"),key,val); }
 
    private function getString(key:Int) : String { return untyped __int_hash_get_string(h,key); }
    private function getInt(key:Int) : Int { return untyped __int_hash_get_int(h,key); }

+ 4 - 4
std/cpp/_std/haxe/ds/ObjectMap.hx

@@ -93,10 +93,10 @@ class ObjectMap<K:{},V> implements haxe.Constraints.IMap<K,V> {
 	}
 
    #if (scriptable)
-   private function setString(key:Dynamic,val:String) : Void { untyped __object_hash_set_string(HX_MAP_THIS,key,val); }
-   private function setInt(key:Dynamic,val:Int) : Void { untyped __object_hash_set_int(HX_MAP_THIS,key,val); }
-   private function setBool(key:Dynamic,val:Bool) : Void { untyped __object_hash_set_int(HX_MAP_THIS,key,val); }
-   private function setFloat(key:Dynamic,val:Float) : Void { untyped __object_hash_set_float(HX_MAP_THIS,key,val); }
+   private function setString(key:Dynamic,val:String) : Void { untyped __object_hash_set_string(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setInt(key:Dynamic,val:Int) : Void { untyped __object_hash_set_int(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setBool(key:Dynamic,val:Bool) : Void { untyped __object_hash_set_int(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setFloat(key:Dynamic,val:Float) : Void { untyped __object_hash_set_float(__cpp__("HX_MAP_THIS"),key,val); }
 
    private function getString(key:Dynamic) : String { return untyped __object_hash_get_string(h,key); }
    private function getInt(key:Dynamic) : Int { return untyped __object_hash_get_int(h,key); }

+ 4 - 4
std/cpp/_std/haxe/ds/StringMap.hx

@@ -93,10 +93,10 @@ package haxe.ds;
 	}
 
    #if (scriptable)
-   private function setString(key:String,val:String) : Void { untyped __string_hash_set_string(HX_MAP_THIS,key,val); }
-   private function setInt(key:String,val:Int) : Void { untyped __string_hash_set_int(HX_MAP_THIS,key,val); }
-   private function setBool(key:String,val:Bool) : Void { untyped __string_hash_set_int(HX_MAP_THIS,key,val); }
-   private function setFloat(key:String,val:Float) : Void { untyped __string_hash_set_float(HX_MAP_THIS,key,val); }
+   private function setString(key:String,val:String) : Void { untyped __string_hash_set_string(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setInt(key:String,val:Int) : Void { untyped __string_hash_set_int(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setBool(key:String,val:Bool) : Void { untyped __string_hash_set_int(__cpp__("HX_MAP_THIS"),key,val); }
+   private function setFloat(key:String,val:Float) : Void { untyped __string_hash_set_float(__cpp__("HX_MAP_THIS"),key,val); }
 
    private function getString(key:String) : String { return untyped __string_hash_get_string(h,key); }
    private function getInt(key:String) : Int { return untyped __string_hash_get_int(h,key); }