Bump inline namespace to match minor version
diff --git a/gen/write.rs b/gen/write.rs
index 6ff04e5..f74fb74 100644
--- a/gen/write.rs
+++ b/gen/write.rs
@@ -123,7 +123,7 @@
}
out.begin_block("namespace rust");
- out.begin_block("inline namespace cxxbridge01");
+ out.begin_block("inline namespace cxxbridge02");
if needs_rust_box || needs_manually_drop || needs_maybe_uninit {
writeln!(out, "// #include \"rust/cxx.h\"");
@@ -131,7 +131,7 @@
if needs_rust_box {
out.next_section();
- for line in include::get("CXXBRIDGE01_RUST_BOX").lines() {
+ for line in include::get("CXXBRIDGE02_RUST_BOX").lines() {
if !line.trim_start().starts_with("//") {
writeln!(out, "{}", line);
}
@@ -161,7 +161,7 @@
writeln!(out, "}};");
}
- out.end_block("namespace cxxbridge01");
+ out.end_block("namespace cxxbridge02");
out.end_block("namespace rust");
}
@@ -195,7 +195,7 @@
for name in out.namespace.clone() {
write!(out, "{}$", name);
}
- write!(out, "cxxbridge01${}(", efn.ident);
+ write!(out, "cxxbridge02${}(", efn.ident);
for (i, arg) in efn.args.iter().enumerate() {
if i > 0 {
write!(out, ", ");
@@ -278,7 +278,7 @@
for name in out.namespace.clone() {
write!(out, "{}$", name);
}
- write!(out, "cxxbridge01${}(", efn.ident);
+ write!(out, "cxxbridge02${}(", efn.ident);
for (i, arg) in efn.args.iter().enumerate() {
if i > 0 {
write!(out, ", ");
@@ -352,7 +352,7 @@
for name in out.namespace.clone() {
write!(out, "{}$", name);
}
- write!(out, "cxxbridge01${}(", efn.ident);
+ write!(out, "cxxbridge02${}(", efn.ident);
for (i, arg) in efn.args.iter().enumerate() {
if i > 0 {
write!(out, ", ");
@@ -507,7 +507,7 @@
out.end_block("extern \"C\"");
out.begin_block("namespace rust");
- out.begin_block("inline namespace cxxbridge01");
+ out.begin_block("inline namespace cxxbridge02");
for ty in types {
if let Type::RustBox(ty) = ty {
if let Type::Ident(inner) = &ty.inner {
@@ -515,7 +515,7 @@
}
}
}
- out.end_block("namespace cxxbridge01");
+ out.end_block("namespace cxxbridge02");
out.end_block("namespace rust");
}
@@ -528,19 +528,19 @@
inner += &ident.to_string();
let instance = inner.replace("::", "$");
- writeln!(out, "#ifndef CXXBRIDGE01_RUST_BOX_{}", instance);
- writeln!(out, "#define CXXBRIDGE01_RUST_BOX_{}", instance);
+ writeln!(out, "#ifndef CXXBRIDGE02_RUST_BOX_{}", instance);
+ writeln!(out, "#define CXXBRIDGE02_RUST_BOX_{}", instance);
writeln!(
out,
- "void cxxbridge01$box${}$uninit(::rust::Box<{}> *ptr) noexcept;",
+ "void cxxbridge02$box${}$uninit(::rust::Box<{}> *ptr) noexcept;",
instance, inner,
);
writeln!(
out,
- "void cxxbridge01$box${}$drop(::rust::Box<{}> *ptr) noexcept;",
+ "void cxxbridge02$box${}$drop(::rust::Box<{}> *ptr) noexcept;",
instance, inner,
);
- writeln!(out, "#endif // CXXBRIDGE01_RUST_BOX_{}", instance);
+ writeln!(out, "#endif // CXXBRIDGE02_RUST_BOX_{}", instance);
}
fn write_rust_box_impl(out: &mut OutFile, ident: &Ident) {
@@ -554,12 +554,12 @@
writeln!(out, "template <>");
writeln!(out, "void Box<{}>::uninit() noexcept {{", inner);
- writeln!(out, " return cxxbridge01$box${}$uninit(this);", instance);
+ writeln!(out, " return cxxbridge02$box${}$uninit(this);", instance);
writeln!(out, "}}");
writeln!(out, "template <>");
writeln!(out, "void Box<{}>::drop() noexcept {{", inner);
- writeln!(out, " return cxxbridge01$box${}$drop(this);", instance);
+ writeln!(out, " return cxxbridge02$box${}$drop(this);", instance);
writeln!(out, "}}");
}
@@ -572,8 +572,8 @@
inner += &ident.to_string();
let instance = inner.replace("::", "$");
- writeln!(out, "#ifndef CXXBRIDGE01_UNIQUE_PTR_{}", instance);
- writeln!(out, "#define CXXBRIDGE01_UNIQUE_PTR_{}", instance);
+ writeln!(out, "#ifndef CXXBRIDGE02_UNIQUE_PTR_{}", instance);
+ writeln!(out, "#define CXXBRIDGE02_UNIQUE_PTR_{}", instance);
writeln!(
out,
"static_assert(sizeof(::std::unique_ptr<{}>) == sizeof(void *), \"\");",
@@ -586,14 +586,14 @@
);
writeln!(
out,
- "void cxxbridge01$unique_ptr${}$null(::std::unique_ptr<{}> *ptr) noexcept {{",
+ "void cxxbridge02$unique_ptr${}$null(::std::unique_ptr<{}> *ptr) noexcept {{",
instance, inner,
);
writeln!(out, " new (ptr) ::std::unique_ptr<{}>();", inner);
writeln!(out, "}}");
writeln!(
out,
- "void cxxbridge01$unique_ptr${}$new(::std::unique_ptr<{}> *ptr, {} *value) noexcept {{",
+ "void cxxbridge02$unique_ptr${}$new(::std::unique_ptr<{}> *ptr, {} *value) noexcept {{",
instance, inner, inner,
);
writeln!(
@@ -604,31 +604,31 @@
writeln!(out, "}}");
writeln!(
out,
- "void cxxbridge01$unique_ptr${}$raw(::std::unique_ptr<{}> *ptr, {} *raw) noexcept {{",
+ "void cxxbridge02$unique_ptr${}$raw(::std::unique_ptr<{}> *ptr, {} *raw) noexcept {{",
instance, inner, inner,
);
writeln!(out, " new (ptr) ::std::unique_ptr<{}>(raw);", inner);
writeln!(out, "}}");
writeln!(
out,
- "const {} *cxxbridge01$unique_ptr${}$get(const ::std::unique_ptr<{}>& ptr) noexcept {{",
+ "const {} *cxxbridge02$unique_ptr${}$get(const ::std::unique_ptr<{}>& ptr) noexcept {{",
inner, instance, inner,
);
writeln!(out, " return ptr.get();");
writeln!(out, "}}");
writeln!(
out,
- "{} *cxxbridge01$unique_ptr${}$release(::std::unique_ptr<{}>& ptr) noexcept {{",
+ "{} *cxxbridge02$unique_ptr${}$release(::std::unique_ptr<{}>& ptr) noexcept {{",
inner, instance, inner,
);
writeln!(out, " return ptr.release();");
writeln!(out, "}}");
writeln!(
out,
- "void cxxbridge01$unique_ptr${}$drop(::std::unique_ptr<{}> *ptr) noexcept {{",
+ "void cxxbridge02$unique_ptr${}$drop(::std::unique_ptr<{}> *ptr) noexcept {{",
instance, inner,
);
writeln!(out, " ptr->~unique_ptr();");
writeln!(out, "}}");
- writeln!(out, "#endif // CXXBRIDGE01_UNIQUE_PTR_{}", instance);
+ writeln!(out, "#endif // CXXBRIDGE02_UNIQUE_PTR_{}", instance);
}