Skip to content

Commit 97fa2a7

Browse files
Move Message::kDescriptorMethods to proto2::internal::kDescriptorMethods.
This allows upcoming changes to direclty instantiate ReflectionData by removing protected accesses to a static member. PiperOrigin-RevId: 866063775
1 parent 1c4f554 commit 97fa2a7

File tree

8 files changed

+108
-92
lines changed

8 files changed

+108
-92
lines changed

src/google/protobuf/compiler/cpp/message.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4075,7 +4075,7 @@ void MessageGenerator::GenerateClassData(io::Printer* p) {
40754075
false,
40764076
$v2_data$,
40774077
},
4078-
&$classname$::kDescriptorMethods,
4078+
&::_pbi::kDescriptorMethods,
40794079
&$desc_table$,
40804080
$tracker_on_get_metadata$,
40814081
};

src/google/protobuf/compiler/java/java_features.pb.cc

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/compiler/plugin.pb.cc

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/cpp_features.pb.cc

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/descriptor.pb.cc

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google/protobuf/dynamic_message.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
#include "google/protobuf/internal_metadata_locator.h"
6666
#include "google/protobuf/map.h"
6767
#include "google/protobuf/map_field.h"
68+
#include "google/protobuf/message.h"
6869
#include "google/protobuf/message_lite.h"
6970
#include "google/protobuf/micro_string.h"
7071
#include "google/protobuf/port.h"
@@ -395,7 +396,7 @@ struct DynamicMessageFactory::TypeInfo {
395396
PROTOBUF_FIELD_OFFSET(DynamicMessage, cached_byte_size_),
396397
false,
397398
},
398-
&DynamicMessage::kDescriptorMethods,
399+
&internal::kDescriptorMethods,
399400
nullptr, // descriptor_table
400401
nullptr, // get_metadata_tracker
401402
};

0 commit comments

Comments
 (0)