mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 21:39:18 +08:00
b29f8ef37e
* [protobuf] upgrade to latest release (v3.18.0) This requires patching OpenCV as it uses a function removed in the latest version of protobuf (FWIW, upstream OpenCV has a similar patch). * The arcus port also needs a patch * The caffe2 port also needs a patch * The brpc port also needs a patch
14 lines
476 B
Diff
14 lines
476 B
Diff
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
|
|
index b6c31fd..8b77c3d 100644
|
|
--- a/src/google/protobuf/descriptor.cc
|
|
+++ b/src/google/protobuf/descriptor.cc
|
|
@@ -794,7 +794,7 @@ class TableArena {
|
|
size = RoundUp(size);
|
|
|
|
Block* to_relocate = nullptr;
|
|
- Block* to_use;
|
|
+ Block* to_use = nullptr;
|
|
|
|
for (size_t i = 0; i < kSmallSizes.size(); ++i) {
|
|
if (small_size_blocks_[i] != nullptr && size <= kSmallSizes[i]) {
|