Make SerializedData into a POD struct.

PiperOrigin-RevId: 676124916
mkruskal-google · Sep 18, 2024 · 5da098b · 5da098b
1 parent 81c582a
commit 5da098b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/rust/cpp_kernel/serialized_data.h b/rust/cpp_kernel/serialized_data.h
@@ -34,8 +34,6 @@ extern "C" struct SerializedData {
   // Owns the memory, must be freed by Rust.
   const uint8_t* data;
   size_t len;
-
-  SerializedData(const uint8_t* data, size_t len) : data(data), len(len) {}
 };
 
 inline bool SerializeMsg(const google::protobuf::MessageLite* msg, SerializedData* out) {
@@ -53,7 +51,8 @@ inline bool SerializeMsg(const google::protobuf::MessageLite* msg, SerializedDat
   if (!msg->SerializeWithCachedSizesToArray(bytes)) {
     return false;
   }
-  *out = SerializedData(bytes, len);
+  out->data = bytes;
+  out->len = len;
   return true;
 }
 

diff --git a/rust/test/cpp/interop/test_utils.cc b/rust/test/cpp/interop/test_utils.cc
@@ -25,7 +25,7 @@ extern "C" void MutateTestAllTypes(protobuf_unittest::TestAllTypes* msg) {
 
 extern "C" SerializedData SerializeTestAllTypes(
     const protobuf_unittest::TestAllTypes* msg) {
-  SerializedData data(nullptr, 0);
+  SerializedData data;
   ABSL_CHECK(SerializeMsg(msg, &data));
   return data;
 }