浏览代码

[cs] use global::cs.Boot instead of cs.Boot

Caue Waneck 12 年之前
父节点
当前提交
7fecf2fe62
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      gencs.ml
  2. 1 1
      libs
  3. 1 1
      tests/unit/Test.hx

+ 2 - 2
gencs.ml

@@ -1678,7 +1678,7 @@ let configure gen =
           begin_block w;
           write w "public static void Main()";
           begin_block w;
-          (if Hashtbl.mem gen.gtypes (["cs"], "Boot") then write w "cs.Boot.init();"; newline w);
+          (if Hashtbl.mem gen.gtypes (["cs"], "Boot") then write w "global::cs.Boot.init();"; newline w);
           expr_s w { eexpr = TTypeExpr(TClassDecl cl); etype = t_dynamic; epos = Ast.null_pos };
           write w ".main();";
           end_block w;
@@ -1716,7 +1716,7 @@ let configure gen =
     if is_main then begin
       write w "public static void Main()";
       begin_block w;
-      (if Hashtbl.mem gen.gtypes (["cs"], "Boot") then write w "cs.Boot.init();"; newline w);
+      (if Hashtbl.mem gen.gtypes (["cs"], "Boot") then write w "global::cs.Boot.init();"; newline w);
       write w "main();";
       end_block w
     end;

+ 1 - 1
libs

@@ -1 +1 @@
-Subproject commit 9702109cfef142c423a8f111dc304aeccf87eebf
+Subproject commit 97ddb4d99884042469e34d1be94b3605d51fbf43

+ 1 - 1
tests/unit/Test.hx

@@ -258,7 +258,7 @@ class Test #if swf_mark implements mt.Protect #end {
 			#if ((dce == "full") && !interp && !as3)
 			new TestDCE(),
 			#end
-			#if (java && !macro)
+			#if ( (java || neko || cpp) && !macro && !interp)
 			new TestThreads(),
 			#end
 			//new TestUnspecified(),