|
@@ -1158,7 +1158,7 @@ let init_class ctx c p context_init herits fields =
|
|
let p = f.cff_pos in
|
|
let p = f.cff_pos in
|
|
let stat = List.mem AStatic f.cff_access in
|
|
let stat = List.mem AStatic f.cff_access in
|
|
let extern = has_meta ":extern" f.cff_meta || c.cl_extern in
|
|
let extern = has_meta ":extern" f.cff_meta || c.cl_extern in
|
|
- let inline = List.mem AInline f.cff_access && not ctx.com.display && (ctx.g.doinline || extern) in
|
|
|
|
|
|
+ let inline = List.mem AInline f.cff_access && (match f.cff_kind with FFun _ -> not ctx.com.display && (ctx.g.doinline || extern) | _ -> true) in
|
|
let override = List.mem AOverride f.cff_access in
|
|
let override = List.mem AOverride f.cff_access in
|
|
if override && not !has_override then begin
|
|
if override && not !has_override then begin
|
|
has_override := true;
|
|
has_override := true;
|