Merge branch 'master' into locale_independent_ifdefs

dbaileychess · web-flow · commit 804237587be5 · 2025-08-28T14:56:11.000-07:00
diff --git a/include/flatbuffers/grpc.h b/include/flatbuffers/grpc.h
@@ -121,7 +121,7 @@ class SliceAllocator : public Allocator {
     memcpy_downward(old_p, old_size, new_p, new_size, in_use_back,
                     in_use_front);
     slice_ = new_slice;
-    return new_p;
+    return const_cast<uint8_t *>(slice_.begin());
   }
 
  private:

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ class SliceAllocator : public Allocator {`
`121`	`121`	`memcpy_downward(old_p, old_size, new_p, new_size, in_use_back,`
`122`	`122`	`in_use_front);`
`123`	`123`	`slice_ = new_slice;`
`124`		`- return new_p;`
	`124`	`+ return const_cast<uint8_t *>(slice_.begin());`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`private:`