diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-11 05:35:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-11 05:35:53 -0800 |
| commit | b570ce853e33bfcfa05dd339bf432377c4a2fab8 (patch) | |
| tree | abd6b1a5349937bdafebf35c2cf90f54c8fae7c6 /libbindgen/src/codegen/mod.rs | |
| parent | 54aba18b3808f07de607137a6aee1a625b076784 (diff) | |
| parent | 8c54a566457a1c4aacabf72977380c25c7fa10a1 (diff) | |
Auto merge of #395 - emilio:inline-namespace, r=fitzgen
ir: Handle inline namespaces.
Here's my proposal to handle them,
r? @fitzgen
Diffstat (limited to 'libbindgen/src/codegen/mod.rs')
| -rw-r--r-- | libbindgen/src/codegen/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbindgen/src/codegen/mod.rs b/libbindgen/src/codegen/mod.rs index d12c3d2a..f8352cc8 100644 --- a/libbindgen/src/codegen/mod.rs +++ b/libbindgen/src/codegen/mod.rs @@ -329,7 +329,8 @@ impl CodeGenerator for Module { } }; - if !ctx.options().enable_cxx_namespaces { + if !ctx.options().enable_cxx_namespaces || + (self.is_inline() && !ctx.options().conservative_inline_namespaces) { codegen_self(result, &mut false); return; } |