Browse Source

[java] reverted accidental commit

Caue Waneck 12 years ago
parent
commit
0f10353be6
1 changed files with 2 additions and 3 deletions
  1. 2 3
      genjava.ml

+ 2 - 3
genjava.ml

@@ -664,7 +664,7 @@ let configure gen =
   let ti64 = match ( get_type gen (["haxe";"_Int64"], "NativeInt64") ) with | TTypeDecl t -> TType(t,[]) | _ -> assert false in
   let ti64 = match ( get_type gen (["haxe";"_Int64"], "NativeInt64") ) with | TTypeDecl t -> TType(t,[]) | _ -> assert false in
 
 
   let has_tdynamic params =
   let has_tdynamic params =
-    List.exists (fun e -> match gen.greal_type e with | TDynamic _ -> true | _ -> false) params
+    List.exists (fun e -> match e with | TDynamic _ -> true | _ -> false) params
   in
   in
 
 
   (*
   (*
@@ -699,8 +699,7 @@ let configure gen =
                   | TAbstract ({ a_path = ["java"],"Char16" },[])
                   | TAbstract ({ a_path = ["java"],"Char16" },[])
                   | TType ({ t_path = [],"Single" },[])
                   | TType ({ t_path = [],"Single" },[])
                   | TAbstract ({ a_path = [],"Single" },[]) ->
                   | TAbstract ({ a_path = [],"Single" },[]) ->
-                      t_dynamic
-                      (*basic.tnull f_t*)
+                      basic.tnull f_t
                   (*| TType ({ t_path = [], "Null"*)
                   (*| TType ({ t_path = [], "Null"*)
                   | TInst (cl, ((_ :: _) as p)) ->
                   | TInst (cl, ((_ :: _) as p)) ->
                     TInst(cl, List.map (fun _ -> t_dynamic) p)
                     TInst(cl, List.map (fun _ -> t_dynamic) p)