diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-18 12:35:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 12:35:22 -0600 |
| commit | c48f835f9e03fdd30d35c7cae63f04cdaa2d9549 (patch) | |
| tree | 46c948439ec4d1e97ae7a4370369c734f550db41 /libbindgen/tests/headers/replace_template_alias.hpp | |
| parent | 0674f6002e71e11ef398d90ed0e4b63ca5bbfce9 (diff) | |
| parent | 2a9341146ff2ae3deef7a39b385360122f406c52 (diff) | |
Auto merge of #281 - fitzgen:namespace-mangle-rust-symbols, r=emilio
Include namespaces in mangled symbols
When we aren't using `--enable-cxx-namespaces`, we can end up with
conflicting struct symbol names that we need to disambiguate. The
solution is to mangle the namespaced C++ symbol "foo::bar::Baz" into the
Rust "foo_bar_Baz" symbol.
This did change the way anonymous types and modules get named a little,
but I think our approach is much more sane now than it was before.
Fixes #267.
r? @emilio
Diffstat (limited to 'libbindgen/tests/headers/replace_template_alias.hpp')
| -rw-r--r-- | libbindgen/tests/headers/replace_template_alias.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbindgen/tests/headers/replace_template_alias.hpp b/libbindgen/tests/headers/replace_template_alias.hpp index 6ceae4e5..b0648994 100644 --- a/libbindgen/tests/headers/replace_template_alias.hpp +++ b/libbindgen/tests/headers/replace_template_alias.hpp @@ -18,6 +18,6 @@ class Rooted { /// But the replacement type does use T! /// -/// <div rustbindgen replaces="MaybeWrapped" /> +/// <div rustbindgen replaces="JS_detail_MaybeWrapped" /> template <typename T> using replaces_MaybeWrapped = T; |