diff --git a/src/bindgen/bindings.rs b/src/bindgen/bindings.rs index b857764..dc1922f 100644 --- a/src/bindgen/bindings.rs +++ b/src/bindgen/bindings.rs @@ -217,8 +217,8 @@ impl Bindings { } if self.config.language == Language::Cxx || self.config.cpp_compat { - if let Some(ref using) = self.config.using { - for namespace in using { + if let Some(ref using_namespaces) = self.config.using_namespaces { + for namespace in using_namespaces { out.new_line(); write!(out, "using namespace {};", namespace); } diff --git a/src/bindgen/config.rs b/src/bindgen/config.rs index aa0d18f..ba962e0 100644 --- a/src/bindgen/config.rs +++ b/src/bindgen/config.rs @@ -621,8 +621,8 @@ pub struct Config { pub namespace: Option, /// An optional list of namespaces. Only applicable when language="C++" pub namespaces: Option>, - /// An optional list of namespaces to ddeclare as using. Only applicable when language="C++" - pub using: Option>, + /// An optional list of namespaces to declare as using. Only applicable when language="C++" + pub using_namespaces: Option>, /// The style to use for braces pub braces: Braces, /// The preferred length of a line, used for auto breaking function arguments @@ -674,7 +674,7 @@ impl Default for Config { no_includes: false, namespace: None, namespaces: None, - using: None, + using_namespaces: None, braces: Braces::SameLine, line_length: 100, tab_width: 2, diff --git a/tests/expectations/both/using.c b/tests/expectations/both/using_namespaces.c similarity index 100% rename from tests/expectations/both/using.c rename to tests/expectations/both/using_namespaces.c diff --git a/tests/expectations/both/using.compat.c b/tests/expectations/both/using_namespaces.compat.c similarity index 100% rename from tests/expectations/both/using.compat.c rename to tests/expectations/both/using_namespaces.compat.c diff --git a/tests/expectations/tag/using.c b/tests/expectations/tag/using_namespaces.c similarity index 100% rename from tests/expectations/tag/using.c rename to tests/expectations/tag/using_namespaces.c diff --git a/tests/expectations/tag/using.compat.c b/tests/expectations/tag/using_namespaces.compat.c similarity index 100% rename from tests/expectations/tag/using.compat.c rename to tests/expectations/tag/using_namespaces.compat.c diff --git a/tests/expectations/using.c b/tests/expectations/using_namespaces.c similarity index 100% rename from tests/expectations/using.c rename to tests/expectations/using_namespaces.c diff --git a/tests/expectations/using.compat.c b/tests/expectations/using_namespaces.compat.c similarity index 100% rename from tests/expectations/using.compat.c rename to tests/expectations/using_namespaces.compat.c diff --git a/tests/expectations/using.cpp b/tests/expectations/using_namespaces.cpp similarity index 78% rename from tests/expectations/using.cpp rename to tests/expectations/using_namespaces.cpp index cd881fa..497a0b8 100644 --- a/tests/expectations/using.cpp +++ b/tests/expectations/using_namespaces.cpp @@ -3,6 +3,8 @@ #include #include +namespace root { + using namespace std; extern "C" { @@ -10,3 +12,5 @@ extern "C" { void root(); } // extern "C" + +} // namespace root diff --git a/tests/rust/using.toml b/tests/rust/using.toml deleted file mode 100644 index 986e255..0000000 --- a/tests/rust/using.toml +++ /dev/null @@ -1 +0,0 @@ -using = ["std"] \ No newline at end of file diff --git a/tests/rust/using.rs b/tests/rust/using_namespaces.rs similarity index 100% rename from tests/rust/using.rs rename to tests/rust/using_namespaces.rs diff --git a/tests/rust/using_namespaces.toml b/tests/rust/using_namespaces.toml new file mode 100644 index 0000000..a1dd9a7 --- /dev/null +++ b/tests/rust/using_namespaces.toml @@ -0,0 +1,2 @@ +namespaces = ["root"] +using_namespaces = ["std"] \ No newline at end of file