Internal changes
PiperOrigin-RevId: 588627840
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
index 4690c3d..ce37423 100644
--- a/src/google/protobuf/descriptor.cc
+++ b/src/google/protobuf/descriptor.cc
@@ -3125,6 +3125,7 @@
return !all_options.empty();
}
+
class SourceLocationCommentPrinter {
public:
template <typename DescType>
diff --git a/src/google/protobuf/descriptor_unittest.cc b/src/google/protobuf/descriptor_unittest.cc
index 244f5c5..843b181 100644
--- a/src/google/protobuf/descriptor_unittest.cc
+++ b/src/google/protobuf/descriptor_unittest.cc
@@ -14,6 +14,7 @@
#include "google/protobuf/descriptor.h"
#include <cstdlib>
+#include <functional>
#include <limits>
#include <memory>
#include <string>
@@ -4018,7 +4019,7 @@
}
// Parse file_text as a FileDescriptorProto in text format and add it
// to the DescriptorPool. Expect no errors.
- const FileDescriptor* BuildFile(const std::string& file_text) {
+ const FileDescriptor* BuildFile(absl::string_view file_text) {
FileDescriptorProto file_proto;
EXPECT_TRUE(TextFormat::ParseFromString(file_text, &file_proto));
return ABSL_DIE_IF_NULL(pool_.BuildFile(file_proto));
@@ -10496,6 +10497,7 @@
+
TEST_F(ValidationErrorTest, ExtensionDeclarationsMatchFullNameCompile) {
BuildFile(R"pb(
name: "foo.proto"
