Skip to content

Commit 78eaf9b

Browse files
jckingcopybara-github
authored andcommitted
Consolidate type providers into two: one for legacy and one for modern
PiperOrigin-RevId: 690350923
1 parent 834c7fd commit 78eaf9b

File tree

90 files changed

+2778
-3443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2778
-3443
lines changed

common/BUILD

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,11 +653,9 @@ cc_library(
653653
"//extensions/protobuf/internal:map_reflection",
654654
"//extensions/protobuf/internal:qualify",
655655
"//internal:casts",
656-
"//internal:deserialize",
657656
"//internal:json",
658657
"//internal:message_equality",
659658
"//internal:number",
660-
"//internal:overflow",
661659
"//internal:protobuf_runtime_version",
662660
"//internal:serialize",
663661
"//internal:status_macros",

common/json.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,7 @@ class AnyToJsonConverter {
495495
return nullptr;
496496
}
497497

498-
virtual absl::Nullable<google::protobuf::MessageFactory*> message_factory() const {
499-
return nullptr;
500-
}
498+
virtual absl::Nullable<google::protobuf::MessageFactory*> message_factory() const = 0;
501499
};
502500

503501
inline std::pair<absl::Nonnull<const google::protobuf::DescriptorPool*>,

0 commit comments

Comments
 (0)