Bump namespace to 04
diff --git a/gen/src/write.rs b/gen/src/write.rs
index ccb9f61..20c63a9 100644
--- a/gen/src/write.rs
+++ b/gen/src/write.rs
@@ -230,7 +230,7 @@
}
out.begin_block("namespace rust");
- out.begin_block("inline namespace cxxbridge03");
+ out.begin_block("inline namespace cxxbridge04");
if needs_rust_string
|| needs_rust_str
@@ -253,15 +253,15 @@
writeln!(out, "struct unsafe_bitcopy_t;");
}
- include::write(out, needs_rust_string, "CXXBRIDGE03_RUST_STRING");
- include::write(out, needs_rust_str, "CXXBRIDGE03_RUST_STR");
- include::write(out, needs_rust_slice, "CXXBRIDGE03_RUST_SLICE");
- include::write(out, needs_rust_box, "CXXBRIDGE03_RUST_BOX");
- include::write(out, needs_rust_vec, "CXXBRIDGE03_RUST_VEC");
- include::write(out, needs_rust_fn, "CXXBRIDGE03_RUST_FN");
- include::write(out, needs_rust_error, "CXXBRIDGE03_RUST_ERROR");
- include::write(out, needs_rust_isize, "CXXBRIDGE03_RUST_ISIZE");
- include::write(out, needs_unsafe_bitcopy, "CXXBRIDGE03_RUST_BITCOPY");
+ include::write(out, needs_rust_string, "CXXBRIDGE04_RUST_STRING");
+ include::write(out, needs_rust_str, "CXXBRIDGE04_RUST_STR");
+ include::write(out, needs_rust_slice, "CXXBRIDGE04_RUST_SLICE");
+ include::write(out, needs_rust_box, "CXXBRIDGE04_RUST_BOX");
+ include::write(out, needs_rust_vec, "CXXBRIDGE04_RUST_VEC");
+ include::write(out, needs_rust_fn, "CXXBRIDGE04_RUST_FN");
+ include::write(out, needs_rust_error, "CXXBRIDGE04_RUST_ERROR");
+ include::write(out, needs_rust_isize, "CXXBRIDGE04_RUST_ISIZE");
+ include::write(out, needs_unsafe_bitcopy, "CXXBRIDGE04_RUST_BITCOPY");
if needs_manually_drop {
out.next_section();
@@ -287,7 +287,7 @@
writeln!(out, "}};");
}
- out.end_block("namespace cxxbridge03");
+ out.end_block("namespace cxxbridge04");
if needs_trycatch {
out.begin_block("namespace behavior");
@@ -316,7 +316,7 @@
}
fn write_struct(out: &mut OutFile, strct: &Struct) {
- let guard = format!("CXXBRIDGE03_STRUCT_{}{}", out.namespace, strct.ident);
+ let guard = format!("CXXBRIDGE04_STRUCT_{}{}", out.namespace, strct.ident);
writeln!(out, "#ifndef {}", guard);
writeln!(out, "#define {}", guard);
for line in strct.doc.to_string().lines() {
@@ -341,7 +341,7 @@
}
fn write_struct_with_methods(out: &mut OutFile, ety: &ExternType, methods: &[&ExternFn]) {
- let guard = format!("CXXBRIDGE03_STRUCT_{}{}", out.namespace, ety.ident);
+ let guard = format!("CXXBRIDGE04_STRUCT_{}{}", out.namespace, ety.ident);
writeln!(out, "#ifndef {}", guard);
writeln!(out, "#define {}", guard);
for line in ety.doc.to_string().lines() {
@@ -362,7 +362,7 @@
}
fn write_enum(out: &mut OutFile, enm: &Enum) {
- let guard = format!("CXXBRIDGE03_ENUM_{}{}", out.namespace, enm.ident);
+ let guard = format!("CXXBRIDGE04_ENUM_{}{}", out.namespace, enm.ident);
writeln!(out, "#ifndef {}", guard);
writeln!(out, "#define {}", guard);
for line in enm.doc.to_string().lines() {
@@ -408,7 +408,7 @@
out.next_section();
writeln!(
out,
- "const char *cxxbridge03$exception(const char *, size_t);",
+ "const char *cxxbridge04$exception(const char *, size_t);",
);
}
}
@@ -553,7 +553,7 @@
writeln!(out, " throw$.len = ::std::strlen(catch$);");
writeln!(
out,
- " throw$.ptr = cxxbridge03$exception(catch$, throw$.len);",
+ " throw$.ptr = cxxbridge04$exception(catch$, throw$.len);",
);
writeln!(out, " }});");
writeln!(out, " return throw$;");
@@ -1026,7 +1026,7 @@
out.end_block("extern \"C\"");
out.begin_block("namespace rust");
- out.begin_block("inline namespace cxxbridge03");
+ out.begin_block("inline namespace cxxbridge04");
for ty in types {
if let Type::RustBox(ty) = ty {
if let Type::Ident(inner) = &ty.inner {
@@ -1040,7 +1040,7 @@
}
}
}
- out.end_block("namespace cxxbridge03");
+ out.end_block("namespace cxxbridge04");
out.end_block("namespace rust");
}
@@ -1053,19 +1053,19 @@
inner += &ident.to_string();
let instance = inner.replace("::", "$");
- writeln!(out, "#ifndef CXXBRIDGE03_RUST_BOX_{}", instance);
- writeln!(out, "#define CXXBRIDGE03_RUST_BOX_{}", instance);
+ writeln!(out, "#ifndef CXXBRIDGE04_RUST_BOX_{}", instance);
+ writeln!(out, "#define CXXBRIDGE04_RUST_BOX_{}", instance);
writeln!(
out,
- "void cxxbridge03$box${}$uninit(::rust::Box<{}> *ptr) noexcept;",
+ "void cxxbridge04$box${}$uninit(::rust::Box<{}> *ptr) noexcept;",
instance, inner,
);
writeln!(
out,
- "void cxxbridge03$box${}$drop(::rust::Box<{}> *ptr) noexcept;",
+ "void cxxbridge04$box${}$drop(::rust::Box<{}> *ptr) noexcept;",
instance, inner,
);
- writeln!(out, "#endif // CXXBRIDGE03_RUST_BOX_{}", instance);
+ writeln!(out, "#endif // CXXBRIDGE04_RUST_BOX_{}", instance);
}
fn write_rust_vec_extern(out: &mut OutFile, element: &Ident) {
@@ -1073,34 +1073,34 @@
let inner = to_typename(&out.namespace, &element);
let instance = to_mangled(&out.namespace, &element);
- writeln!(out, "#ifndef CXXBRIDGE03_RUST_VEC_{}", instance);
- writeln!(out, "#define CXXBRIDGE03_RUST_VEC_{}", instance);
+ writeln!(out, "#ifndef CXXBRIDGE04_RUST_VEC_{}", instance);
+ writeln!(out, "#define CXXBRIDGE04_RUST_VEC_{}", instance);
writeln!(
out,
- "void cxxbridge03$rust_vec${}$new(const ::rust::Vec<{}> *ptr) noexcept;",
+ "void cxxbridge04$rust_vec${}$new(const ::rust::Vec<{}> *ptr) noexcept;",
instance, inner,
);
writeln!(
out,
- "void cxxbridge03$rust_vec${}$drop(::rust::Vec<{}> *ptr) noexcept;",
+ "void cxxbridge04$rust_vec${}$drop(::rust::Vec<{}> *ptr) noexcept;",
instance, inner,
);
writeln!(
out,
- "size_t cxxbridge03$rust_vec${}$len(const ::rust::Vec<{}> *ptr) noexcept;",
+ "size_t cxxbridge04$rust_vec${}$len(const ::rust::Vec<{}> *ptr) noexcept;",
instance, inner,
);
writeln!(
out,
- "const {} *cxxbridge03$rust_vec${}$data(const ::rust::Vec<{0}> *ptr) noexcept;",
+ "const {} *cxxbridge04$rust_vec${}$data(const ::rust::Vec<{0}> *ptr) noexcept;",
inner, instance,
);
writeln!(
out,
- "size_t cxxbridge03$rust_vec${}$stride() noexcept;",
+ "size_t cxxbridge04$rust_vec${}$stride() noexcept;",
instance,
);
- writeln!(out, "#endif // CXXBRIDGE03_RUST_VEC_{}", instance);
+ writeln!(out, "#endif // CXXBRIDGE04_RUST_VEC_{}", instance);
}
fn write_rust_box_impl(out: &mut OutFile, ident: &Ident) {
@@ -1114,12 +1114,12 @@
writeln!(out, "template <>");
writeln!(out, "void Box<{}>::uninit() noexcept {{", inner);
- writeln!(out, " cxxbridge03$box${}$uninit(this);", instance);
+ writeln!(out, " cxxbridge04$box${}$uninit(this);", instance);
writeln!(out, "}}");
writeln!(out, "template <>");
writeln!(out, "void Box<{}>::drop() noexcept {{", inner);
- writeln!(out, " cxxbridge03$box${}$drop(this);", instance);
+ writeln!(out, " cxxbridge04$box${}$drop(this);", instance);
writeln!(out, "}}");
}
@@ -1130,35 +1130,35 @@
writeln!(out, "template <>");
writeln!(out, "Vec<{}>::Vec() noexcept {{", inner);
- writeln!(out, " cxxbridge03$rust_vec${}$new(this);", instance);
+ writeln!(out, " cxxbridge04$rust_vec${}$new(this);", instance);
writeln!(out, "}}");
writeln!(out, "template <>");
writeln!(out, "void Vec<{}>::drop() noexcept {{", inner);
writeln!(
out,
- " return cxxbridge03$rust_vec${}$drop(this);",
+ " return cxxbridge04$rust_vec${}$drop(this);",
instance,
);
writeln!(out, "}}");
writeln!(out, "template <>");
writeln!(out, "size_t Vec<{}>::size() const noexcept {{", inner);
- writeln!(out, " return cxxbridge03$rust_vec${}$len(this);", instance);
+ writeln!(out, " return cxxbridge04$rust_vec${}$len(this);", instance);
writeln!(out, "}}");
writeln!(out, "template <>");
writeln!(out, "const {} *Vec<{0}>::data() const noexcept {{", inner);
writeln!(
out,
- " return cxxbridge03$rust_vec${}$data(this);",
+ " return cxxbridge04$rust_vec${}$data(this);",
instance,
);
writeln!(out, "}}");
writeln!(out, "template <>");
writeln!(out, "size_t Vec<{}>::stride() noexcept {{", inner);
- writeln!(out, " return cxxbridge03$rust_vec${}$stride();", instance);
+ writeln!(out, " return cxxbridge04$rust_vec${}$stride();", instance);
writeln!(out, "}}");
}
@@ -1166,12 +1166,12 @@
let ty = Type::Ident(ident.clone());
let instance = to_mangled(&out.namespace, &ty);
- writeln!(out, "#ifndef CXXBRIDGE03_UNIQUE_PTR_{}", instance);
- writeln!(out, "#define CXXBRIDGE03_UNIQUE_PTR_{}", instance);
+ writeln!(out, "#ifndef CXXBRIDGE04_UNIQUE_PTR_{}", instance);
+ writeln!(out, "#define CXXBRIDGE04_UNIQUE_PTR_{}", instance);
write_unique_ptr_common(out, &ty, types);
- writeln!(out, "#endif // CXXBRIDGE03_UNIQUE_PTR_{}", instance);
+ writeln!(out, "#endif // CXXBRIDGE04_UNIQUE_PTR_{}", instance);
}
// Shared by UniquePtr<T> and UniquePtr<CxxVector<T>>.
@@ -1198,7 +1198,7 @@
);
writeln!(
out,
- "void cxxbridge03$unique_ptr${}$null(::std::unique_ptr<{}> *ptr) noexcept {{",
+ "void cxxbridge04$unique_ptr${}$null(::std::unique_ptr<{}> *ptr) noexcept {{",
instance, inner,
);
writeln!(out, " new (ptr) ::std::unique_ptr<{}>();", inner);
@@ -1206,7 +1206,7 @@
if can_construct_from_value {
writeln!(
out,
- "void cxxbridge03$unique_ptr${}$new(::std::unique_ptr<{}> *ptr, {} *value) noexcept {{",
+ "void cxxbridge04$unique_ptr${}$new(::std::unique_ptr<{}> *ptr, {} *value) noexcept {{",
instance, inner, inner,
);
writeln!(
@@ -1218,28 +1218,28 @@
}
writeln!(
out,
- "void cxxbridge03$unique_ptr${}$raw(::std::unique_ptr<{}> *ptr, {} *raw) noexcept {{",
+ "void cxxbridge04$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 {} *cxxbridge03$unique_ptr${}$get(const ::std::unique_ptr<{}>& ptr) noexcept {{",
+ "const {} *cxxbridge04$unique_ptr${}$get(const ::std::unique_ptr<{}>& ptr) noexcept {{",
inner, instance, inner,
);
writeln!(out, " return ptr.get();");
writeln!(out, "}}");
writeln!(
out,
- "{} *cxxbridge03$unique_ptr${}$release(::std::unique_ptr<{}>& ptr) noexcept {{",
+ "{} *cxxbridge04$unique_ptr${}$release(::std::unique_ptr<{}>& ptr) noexcept {{",
inner, instance, inner,
);
writeln!(out, " return ptr.release();");
writeln!(out, "}}");
writeln!(
out,
- "void cxxbridge03$unique_ptr${}$drop(::std::unique_ptr<{}> *ptr) noexcept {{",
+ "void cxxbridge04$unique_ptr${}$drop(::std::unique_ptr<{}> *ptr) noexcept {{",
instance, inner,
);
writeln!(out, " ptr->~unique_ptr();");
@@ -1251,18 +1251,18 @@
let inner = to_typename(&out.namespace, &element);
let instance = to_mangled(&out.namespace, &element);
- writeln!(out, "#ifndef CXXBRIDGE03_VECTOR_{}", instance);
- writeln!(out, "#define CXXBRIDGE03_VECTOR_{}", instance);
+ writeln!(out, "#ifndef CXXBRIDGE04_VECTOR_{}", instance);
+ writeln!(out, "#define CXXBRIDGE04_VECTOR_{}", instance);
writeln!(
out,
- "size_t cxxbridge03$std$vector${}$size(const ::std::vector<{}> &s) noexcept {{",
+ "size_t cxxbridge04$std$vector${}$size(const ::std::vector<{}> &s) noexcept {{",
instance, inner,
);
writeln!(out, " return s.size();");
writeln!(out, "}}");
writeln!(
out,
- "const {} *cxxbridge03$std$vector${}$get_unchecked(const ::std::vector<{}> &s, size_t pos) noexcept {{",
+ "const {} *cxxbridge04$std$vector${}$get_unchecked(const ::std::vector<{}> &s, size_t pos) noexcept {{",
inner, instance, inner,
);
writeln!(out, " return &s[pos];");
@@ -1270,5 +1270,5 @@
write_unique_ptr_common(out, vector_ty, types);
- writeln!(out, "#endif // CXXBRIDGE03_VECTOR_{}", instance);
+ writeln!(out, "#endif // CXXBRIDGE04_VECTOR_{}", instance);
}