Skip to content

Clean up the descriptor database migration temporary macro. #24254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −11
Draft

Clean up the descriptor database migration temporary macro. #24254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/google/protobuf/port_def.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,18 +163,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),

#endif

// Introducing a future-breaking change guard for descriptor database migration.
// This allows google3 to transition to absl::string_view while keeping OSS
// on std::string until the migration is fully completed.
// The temporary macro enables incremental migration before permanently flipping
// the switch.
#ifdef PROTOBUF_FUTURE_STRING_VIEW_DESCRIPTOR_DATABASE
#error PROTOBUF_FUTURE_STRING_VIEW_DESCRIPTOR_DATABASE was previously defined
#endif

#if defined(PROTOBUF_TEMPORARY_ENABLE_STRING_VIEW_DESCRIPTOR_DATABASE)
#define PROTOBUF_FUTURE_STRING_VIEW_DESCRIPTOR_DATABASE 1
#endif

#ifdef PROTOBUF_ALWAYS_INLINE
#error PROTOBUF_ALWAYS_INLINE was previously defined
Expand Down
Loading