fix cxx.cc MACRO; support for CxxString.

dtolnay · Sep 17, 2024 · 827fd85 · 827fd85
1 parent 7067a6c
commit 827fd85
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/cxx.cc b/src/cxx.cc
@@ -840,16 +840,19 @@ static_assert(sizeof(std::string) <= kMaxExpectedWordsInString * sizeof(void *),
 
 #define FOR_EACH_TRIVIAL_STD_VECTOR_PTR(MACRO)                                 \
   FOR_EACH_NUMERIC_WITH_PTR_PREFIX(MACRO)                                      \
-  MACRO(string, usize, std::size_t)                                            \
-  MACRO(string, isize, rust::isize)
+  MACRO(ptrc, usize, std::size_t)                                              \
+  MACRO(ptrc, isize, rust::isize)                                              \
+  MACRO(ptrm, usize, std::size_t)                                              \
+  MACRO(ptrm, isize, rust::isize)
 
 #define FOR_EACH_STD_VECTOR(MACRO)                                             \
   FOR_EACH_TRIVIAL_STD_VECTOR(MACRO)                                           \
   MACRO(string, std::string)
 
 #define FOR_EACH_STD_VECTOR_PTR(MACRO)                                         \
   FOR_EACH_TRIVIAL_STD_VECTOR_PTR(MACRO)                                       \
-  MACRO(string, string, std::string)
+  MACRO(ptrc, string, std::string)                                             \
+  MACRO(ptrm, string, std::string)
 
 #define FOR_EACH_RUST_VEC(MACRO)                                               \
   FOR_EACH_NUMERIC(MACRO)                                                      \

diff --git a/src/cxx_vector.rs b/src/cxx_vector.rs
@@ -862,4 +862,7 @@ impl_ptr_vector_element_for_primitive!(ptrm, i32);
 impl_ptr_vector_element_for_primitive!(ptrm, i64);
 impl_ptr_vector_element_for_primitive!(ptrm, isize);
 impl_ptr_vector_element_for_primitive!(ptrm, f32);
-impl_ptr_vector_element_for_primitive!(ptrm, f64);
+impl_ptr_vector_element_for_primitive!(ptrm, f64);
+
+impl_ptrc_vector_element!(opaque, "string", "CxxString", CxxString);
+impl_ptrm_vector_element!(opaque, "string", "CxxString", CxxString);