roachpb: rename the minor/major version fields#17650
Merged
knz merged 1 commit intocockroachdb:masterfrom Aug 15, 2017
Merged
Conversation
Member
|
This change is |
Contributor
Author
|
cc @tschottdorf |
Contributor
|
Reviewed 7 of 7 files at r1. pkg/roachpb/metadata.proto, line 175 at r1 (raw file):
add a comment explaining this? probably should be Comments from Reviewable |
7c8ee28 to
74461bb
Compare
On FreeBSD, the standard C/C++ header `sys/types.h` defines two macros `major` and `minor`; this subsequently prevents proper compilation of protobuf-generated C++ code for message fields with these names. This patch restores FreeBSD compatibility by giving different names to these two fields. The Go names remain unchanged.
74461bb to
e2e9ff2
Compare
Contributor
Author
|
Done. |
tbg
approved these changes
Aug 15, 2017
irfansharif
added a commit
to irfansharif/cockroach
that referenced
this pull request
Feb 26, 2020
cockroachdb#17650 renamed these fields for the protobuf-generated C++ code, leaving the Go code unchanged. Isolate the associated comment so it doesn't confusingly appear in the Go code. Release note: None
irfansharif
added a commit
to irfansharif/cockroach
that referenced
this pull request
Feb 26, 2020
cockroachdb#17650 renamed these fields for the protobuf-generated C++ code, leaving the Go code unchanged. Isolate the associated comment so it doesn't confusingly appear in the Go code. Release note: None
irfansharif
added a commit
to irfansharif/cockroach
that referenced
this pull request
Feb 27, 2020
cockroachdb#17650 renamed these fields for the protobuf-generated C++ code, leaving the Go code unchanged. Isolate the associated comment so it doesn't confusingly appear in the Go code. Release note: None
irfansharif
added a commit
to irfansharif/cockroach
that referenced
this pull request
Feb 27, 2020
cockroachdb#17650 renamed these fields for the protobuf-generated C++ code, leaving the Go code unchanged. Isolate the associated comment so it doesn't confusingly appear in the Go code. Release note: None
irfansharif
added a commit
to irfansharif/cockroach
that referenced
this pull request
Feb 27, 2020
cockroachdb#17650 renamed these fields for the protobuf-generated C++ code, leaving the Go code unchanged. Isolate the associated comment so it doesn't confusingly appear in the Go code. Release note: None
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On FreeBSD, the standard C/C++ header
sys/types.hdefines two macrosmajorandminor; this subsequently prevents proper compilation ofprotobuf-generated C++ code for message fields with these names.
This patch restores FreeBSD compatibility by giving different
names to these two fields. The Go names remain unchanged.
Fixes #17542.