Use integer standard library types from std namespace
The implementation is not required to define these types in the global
namespace.
diff --git a/gen/src/write.rs b/gen/src/write.rs
index 44978f1..812c324 100644
--- a/gen/src/write.rs
+++ b/gen/src/write.rs
@@ -164,7 +164,7 @@
writeln!(out, "template <> struct hash<{}> {{", qualified);
writeln!(
out,
- " size_t operator()(const {} &self) const noexcept {{",
+ " ::std::size_t operator()(const {} &self) const noexcept {{",
qualified,
);
let link_name = mangle::operator(&strct.name, "hash");
@@ -473,7 +473,7 @@
let link_name = mangle::operator(&strct.name, "hash");
writeln!(
out,
- "size_t {}(const {} &) noexcept;",
+ "::std::size_t {}(const {} &) noexcept;",
link_name, strct.name.cxx,
);
}
@@ -1165,15 +1165,15 @@
match atom {
Bool => write!(out, "bool"),
Char => write!(out, "char"),
- U8 => write!(out, "uint8_t"),
- U16 => write!(out, "uint16_t"),
- U32 => write!(out, "uint32_t"),
- U64 => write!(out, "uint64_t"),
- Usize => write!(out, "size_t"),
- I8 => write!(out, "int8_t"),
- I16 => write!(out, "int16_t"),
- I32 => write!(out, "int32_t"),
- I64 => write!(out, "int64_t"),
+ U8 => write!(out, "::std::uint8_t"),
+ U16 => write!(out, "::std::uint16_t"),
+ U32 => write!(out, "::std::uint32_t"),
+ U64 => write!(out, "::std::uint64_t"),
+ Usize => write!(out, "::std::size_t"),
+ I8 => write!(out, "::std::int8_t"),
+ I16 => write!(out, "::std::int16_t"),
+ I32 => write!(out, "::std::int32_t"),
+ I64 => write!(out, "::std::int64_t"),
Isize => write!(out, "::rust::isize"),
F32 => write!(out, "float"),
F64 => write!(out, "double"),
@@ -1384,12 +1384,12 @@
);
writeln!(
out,
- "size_t cxxbridge1$rust_vec${}$len(const ::rust::Vec<{}> *ptr) noexcept;",
+ "::std::size_t cxxbridge1$rust_vec${}$len(const ::rust::Vec<{}> *ptr) noexcept;",
instance, inner,
);
writeln!(
out,
- "size_t cxxbridge1$rust_vec${}$capacity(const ::rust::Vec<{}> *ptr) noexcept;",
+ "::std::size_t cxxbridge1$rust_vec${}$capacity(const ::rust::Vec<{}> *ptr) noexcept;",
instance, inner,
);
writeln!(
@@ -1399,17 +1399,17 @@
);
writeln!(
out,
- "void cxxbridge1$rust_vec${}$reserve_total(::rust::Vec<{}> *ptr, size_t cap) noexcept;",
+ "void cxxbridge1$rust_vec${}$reserve_total(::rust::Vec<{}> *ptr, ::std::size_t cap) noexcept;",
instance, inner,
);
writeln!(
out,
- "void cxxbridge1$rust_vec${}$set_len(::rust::Vec<{}> *ptr, size_t len) noexcept;",
+ "void cxxbridge1$rust_vec${}$set_len(::rust::Vec<{}> *ptr, ::std::size_t len) noexcept;",
instance, inner,
);
writeln!(
out,
- "size_t cxxbridge1$rust_vec${}$stride() noexcept;",
+ "::std::size_t cxxbridge1$rust_vec${}$stride() noexcept;",
instance,
);
writeln!(out, "#endif // CXXBRIDGE1_RUST_VEC_{}", instance);
@@ -1460,12 +1460,20 @@
writeln!(out, "}}");
writeln!(out, "template <>");
- writeln!(out, "size_t Vec<{}>::size() const noexcept {{", inner);
+ writeln!(
+ out,
+ "::std::size_t Vec<{}>::size() const noexcept {{",
+ inner,
+ );
writeln!(out, " return cxxbridge1$rust_vec${}$len(this);", instance);
writeln!(out, "}}");
writeln!(out, "template <>");
- writeln!(out, "size_t Vec<{}>::capacity() const noexcept {{", inner);
+ writeln!(
+ out,
+ "::std::size_t Vec<{}>::capacity() const noexcept {{",
+ inner,
+ );
writeln!(
out,
" return cxxbridge1$rust_vec${}$capacity(this);",
@@ -1481,7 +1489,7 @@
writeln!(out, "template <>");
writeln!(
out,
- "void Vec<{}>::reserve_total(size_t cap) noexcept {{",
+ "void Vec<{}>::reserve_total(::std::size_t cap) noexcept {{",
inner,
);
writeln!(
@@ -1492,7 +1500,11 @@
writeln!(out, "}}");
writeln!(out, "template <>");
- writeln!(out, "void Vec<{}>::set_len(size_t len) noexcept {{", inner);
+ writeln!(
+ out,
+ "void Vec<{}>::set_len(::std::size_t len) noexcept {{",
+ inner,
+ );
writeln!(
out,
" return cxxbridge1$rust_vec${}$set_len(this, len);",
@@ -1501,7 +1513,7 @@
writeln!(out, "}}");
writeln!(out, "template <>");
- writeln!(out, "size_t Vec<{}>::stride() noexcept {{", inner);
+ writeln!(out, "::std::size_t Vec<{}>::stride() noexcept {{", inner);
writeln!(out, " return cxxbridge1$rust_vec${}$stride();", instance);
writeln!(out, "}}");
}
@@ -1716,14 +1728,14 @@
writeln!(out, "#define CXXBRIDGE1_VECTOR_{}", instance);
writeln!(
out,
- "size_t cxxbridge1$std$vector${}$size(const ::std::vector<{}> &s) noexcept {{",
+ "::std::size_t cxxbridge1$std$vector${}$size(const ::std::vector<{}> &s) noexcept {{",
instance, inner,
);
writeln!(out, " return s.size();");
writeln!(out, "}}");
writeln!(
out,
- "const {} *cxxbridge1$std$vector${}$get_unchecked(const ::std::vector<{}> &s, size_t pos) noexcept {{",
+ "const {} *cxxbridge1$std$vector${}$get_unchecked(const ::std::vector<{}> &s, ::std::size_t pos) noexcept {{",
inner, instance, inner,
);
writeln!(out, " return &s[pos];");