From 19983ec07f4b798300acac0096d95cfa6e44837c Mon Sep 17 00:00:00 2001
From: Yury Kats <ykats@google.com>
Date: Fri, 10 Jan 2025 11:03:39 -0500
Subject: [PATCH] protobuf: Replace string addition with absl::StrCat (#37961)
Signed-off-by: Yury Kats <ykats@google.com>
---
source/common/protobuf/create_reflectable_message.cc | 3 ++-
source/common/protobuf/utility.cc | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/source/common/protobuf/create_reflectable_message.cc b/source/common/protobuf/create_reflectable_message.cc
index f284a5d85a82..133c9dd0a90a 100644
--- a/source/common/protobuf/create_reflectable_message.cc
+++ b/source/common/protobuf/create_reflectable_message.cc
@@ -447,7 +447,8 @@ void loadFileDescriptors(const FileDescriptorInfo& file_descriptor_info) {
Protobuf::ReflectableMessage createReflectableMessage(const Protobuf::Message& message) {
Protobuf::ReflectableMessage reflectable_message = createDynamicMessage(getTranscoder(), message);
- ASSERT(reflectable_message, "Unable to create dyanmic message for: " + message.GetTypeName());
+ ASSERT(reflectable_message,
+ absl::StrCat("Unable to create dyanmic message for: ", message.GetTypeName()));
return reflectable_message;
}
diff --git a/source/common/protobuf/utility.cc b/source/common/protobuf/utility.cc
index 5a6468dbecc6..ea5b71ecf269 100644
--- a/source/common/protobuf/utility.cc
+++ b/source/common/protobuf/utility.cc
@@ -943,8 +943,8 @@ absl::Status MessageUtil::loadFromFile(const std::string& path, Protobuf::Messag
loadFromJson(contents, message, validation_visitor);
}
#else
- return absl::InvalidArgumentError("Unable to parse file \"" + path + "\" (type " +
- message.GetTypeName() + ")");
+ return absl::InvalidArgumentError(
+ absl::StrCat("Unable to parse file \"", path, "\" (type ", message.GetTypeName(), ")"));
#endif
return absl::OkStatus();
}