Skip to content

Commit

Permalink
Merge pull request protocolbuffers#10493 from grongor/patch-1
Browse files Browse the repository at this point in the history
Move note to the top
  • Loading branch information
deannagarcia committed Sep 12, 2022
2 parents 27a39fd + 2a8fa7a commit a237950
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions google/protobuf/descriptor.proto
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,10 @@ message MessageOptions {

reserved 4, 5, 6;

// NOTE: Do not set the option in .proto files. Always use the maps syntax
// instead. The option should only be implicitly set by the proto compiler
// parser.
//
// Whether the message is an automatically generated map entry type for the
// maps field.
//
Expand All @@ -519,10 +523,6 @@ message MessageOptions {
// use a native map in the target language to hold the keys and values.
// The reflection APIs in such implementations still need to work as
// if the field is a repeated message field.
//
// NOTE: Do not set the option in .proto files. Always use the maps syntax
// instead. The option should only be implicitly set by the proto compiler
// parser.
optional bool map_entry = 7;

reserved 8; // javalite_serializable
Expand Down

0 comments on commit a237950

Please sign in to comment.