mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 15:19:03 +08:00
26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
|
diff --git a/src/brpc/thrift_message.cpp b/src/brpc/thrift_message.cpp
|
||
|
index ed3d7557..7b9d210a 100644
|
||
|
--- a/src/brpc/thrift_message.cpp
|
||
|
+++ b/src/brpc/thrift_message.cpp
|
||
|
@@ -22,7 +22,6 @@
|
||
|
#include <algorithm>
|
||
|
#include "butil/logging.h"
|
||
|
|
||
|
-#include <google/protobuf/stubs/once.h>
|
||
|
#include <google/protobuf/io/coded_stream.h>
|
||
|
#include <google/protobuf/descriptor.h>
|
||
|
#include <google/protobuf/reflection_ops.h>
|
||
|
diff --git a/src/brpc/thrift_message.h b/src/brpc/thrift_message.h
|
||
|
index 53041c85..471bafb5 100644
|
||
|
--- a/src/brpc/thrift_message.h
|
||
|
+++ b/src/brpc/thrift_message.h
|
||
|
@@ -101,7 +101,7 @@ public:
|
||
|
void SerializeWithCachedSizes(
|
||
|
::google::protobuf::io::CodedOutputStream* output) const PB_310_OVERRIDE;
|
||
|
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const PB_310_OVERRIDE;
|
||
|
- int GetCachedSize() const override { return ByteSize(); }
|
||
|
+ int GetCachedSize() const { return ByteSize(); }
|
||
|
|
||
|
protected:
|
||
|
::google::protobuf::Metadata GetMetadata() const override;
|