Nicolas Cannasse пре 7 година
родитељ
комит
70d91fd69d

+ 2 - 2
tests/unit/src/unit/TestMisc.hx

@@ -390,14 +390,14 @@ class TestMisc extends Test {
 		eq( opt3(7.4).y, 7.4 );
 
 		eq( opt4(), 11 );
-		#if !(flash || cpp || cs || java || hl)
+		#if !static
 		eq( opt4(null), 11 );
 		#end
 
 		var opt4b : ?Int -> Null<Int> = opt4;
 		eq( opt4b(), 11 );
 		eq( opt4b(3), 4 );
-		#if !(flash || cpp || cs || java || hl)
+		#if !static
 		eq( opt4b(null), 11 );
 		#end
 

+ 1 - 1
tests/unit/src/unit/issues/Issue3585.hx

@@ -2,7 +2,7 @@ package unit.issues;
 import unit.Test;
 
 class Issue3585 extends Test {
-	#if (flash || java || cs || cpp) // this is only relevant on static platforms
+	#if static // this is only relevant on static platforms
 	function test() {
 		var v = inlineUnwrap();
 		eq(getType(v), "Int");

+ 1 - 1
tests/unit/src/unit/issues/Issue4695.hx

@@ -9,7 +9,7 @@ class Issue4695 extends unit.Test {
 	public function testNull() {
 		f("" == null);
 		f(eqCheck("", null));
-		#if !(cpp || flash9 || as3 || java || cs || hl)
+		#if !static
 		f(false == null);
 		f(eqCheck(false, null));
 		#end

+ 3 - 3
tests/unit/src/unitstd/haxe/ds/Vector.unit.hx

@@ -1,7 +1,7 @@
 var vec = new haxe.ds.Vector(3);
-var vNullInt = #if (flash || cpp || java || cs || hl) 0 #else null #end;
-var vNullBool = #if (flash || cpp || java || cs || hl) false #else null #end;
-var vNullFloat = #if (flash || cpp || java || cs || hl) 0.0 #else null #end;
+var vNullInt = #if static 0 #else null #end;
+var vNullBool = #if static false #else null #end;
+var vNullFloat = #if static 0.0 #else null #end;
 vec.length == 3;
 vec.get(0) == vNullInt;
 vec.get(1) == vNullInt;