diff --git a/src/gen.rs b/src/gen.rs index fc2cadb82d..eab4478afb 100644 --- a/src/gen.rs +++ b/src/gen.rs @@ -968,6 +968,7 @@ fn cstruct_to_rs(ctx: &mut GenCtx, name: &str, ci: CompInfo, vffields.push(field); } + let mut counts: HashMap = HashMap::new(); for vm in ci.vmethods.iter() { let ty = match vm.ty { TFuncPtr(ref sig) => { @@ -977,7 +978,19 @@ fn cstruct_to_rs(ctx: &mut GenCtx, name: &str, ci: CompInfo, _ => unreachable!() }; - let name = first(rust_id(ctx, &vm.name)); + let mut name = vm.name.clone(); + let mut count = 0; + match counts.get(&vm.name) { + Some(x) => { + count = *x; + name.push_str(&x.to_string()); + }, + None => () + } + count += 1; + counts.insert(vm.name.clone(), count); + + let name = first(rust_id(ctx, &name)); vffields.push(ast::StructField { span: ctx.span, diff --git a/src/parser.rs b/src/parser.rs index 68578723c0..d8227f3ac4 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1490,6 +1490,7 @@ pub fn parse(options: ClangParserOptions, logger: &Logger) -> Result 0 { + logger.error(&format!("{} errors after diagnostics", ctx.err_count)); return Err(()) } @@ -1510,6 +1511,7 @@ pub fn parse(options: ClangParserOptions, logger: &Logger) -> Result 0 { + logger.error(&format!("{} errors after translation", ctx.err_count)); return Err(()) } diff --git a/tests/expectations/virtual_overloaded.rs b/tests/expectations/virtual_overloaded.rs new file mode 100644 index 0000000000..a59f9c2705 --- /dev/null +++ b/tests/expectations/virtual_overloaded.rs @@ -0,0 +1,26 @@ +/* automatically generated by rust-bindgen */ + + +#![allow(non_snake_case)] + + +#[repr(C)] +#[derive(Debug, Copy)] +pub struct Struct_C { + pub _vftable: *const _vftable_Struct_C, +} +#[repr(C)] +pub struct _vftable_Struct_C { + pub do_thing: unsafe extern "C" fn(this: *mut ::std::os::raw::c_void, + arg1: ::std::os::raw::c_char), + pub do_thing1: unsafe extern "C" fn(this: *mut ::std::os::raw::c_void, + arg1: ::std::os::raw::c_int), +} +impl ::std::clone::Clone for Struct_C { + fn clone(&self) -> Self { *self } +} +#[test] +fn bindgen_test_layout_Struct_C() { + assert_eq!(::std::mem::size_of::() , 8usize); + assert_eq!(::std::mem::align_of::() , 8usize); +} diff --git a/tests/headers/virtual_overloaded.hpp b/tests/headers/virtual_overloaded.hpp new file mode 100644 index 0000000000..8aea8a19f5 --- /dev/null +++ b/tests/headers/virtual_overloaded.hpp @@ -0,0 +1,5 @@ +class C { +public: + virtual void do_thing(char) { }; + virtual void do_thing(int) { }; +};