[brpc] Update to 1.10.0 (#40215)

This commit is contained in:
Cheney Wang 2024-08-08 21:20:01 -07:00 committed by GitHub
parent 5728849979
commit c0307179cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 5 deletions

View File

@ -0,0 +1,22 @@
diff --git a/src/brpc/serialized_response.h b/src/brpc/serialized_response.h
index 4e7d86e..3b33cb2 100644
--- a/src/brpc/serialized_response.h
+++ b/src/brpc/serialized_response.h
@@ -53,7 +53,7 @@ public:
void Clear() override;
bool IsInitialized() const override;
int ByteSize() const;
- int GetCachedSize() const override { return (int)_serialized.size(); }
+ int GetCachedSize() const PB_422_OVERRIDE { return (int)_serialized.size(); }
butil::IOBuf& serialized_data() { return _serialized; }
const butil::IOBuf& serialized_data() const { return _serialized; }
@@ -71,7 +71,7 @@ private:
void MergeFrom(const SerializedResponse& from);
void SharedCtor();
void SharedDtor();
- void SetCachedSize(int size) const override;
+ void SetCachedSize(int size) const PB_422_OVERRIDE;
private:
butil::IOBuf _serialized;

View File

@ -2,12 +2,13 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/brpc
REF "${VERSION}"
SHA512 a908c3cf63224d6fb98f1855aca75c3adf528c40da5180c6e298cc52ee9ccbef08809a81078333bdd6ac1a4af54448edac8dd4e0333e72e9dec2790454355e7a
SHA512 cc1a373d94752c43376a731b4f08dc559bffcd67bdad7e22268a2a20a1034b40d658d591d946d4c1aa94287060146eb041626e0354188ee7dc41554512d72490
HEAD_REF master
PATCHES
fix-build.patch
fix-warnings.patch
protobuf.patch
fix-compilation-error.patch
)
vcpkg_cmake_configure(

View File

@ -1,7 +1,6 @@
{
"name": "brpc",
"version": "1.9.0",
"port-version": 1,
"version": "1.10.0",
"description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
"homepage": "https://github.com/apache/brpc",
"license": "Apache-2.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0da3bb20bb9b3dd1b8ef66a4f812f16496be422c",
"version": "1.10.0",
"port-version": 0
},
{
"git-tree": "e3c927bb9bf156c75d26d06f1c0c250afd50df69",
"version": "1.9.0",

View File

@ -1377,8 +1377,8 @@
"port-version": 1
},
"brpc": {
"baseline": "1.9.0",
"port-version": 1
"baseline": "1.10.0",
"port-version": 0
},
"brunocodutra-metal": {
"baseline": "2.1.4",