Skip to content
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

Jump to bottom

Handle "reserved" field names which would otherwise cause member collisions #662

Closed
wants to merge 15 commits into from
Closed

Handle "reserved" field names which would otherwise cause member collisions #662

wants to merge 15 commits into from

Conversation

jskeet
Copy link
Contributor

@jskeet jskeet commented Jul 30, 2015

(Based on PR #660)

TeBoring and others added 11 commits July 21, 2015 15:45
@TeBoring
Add packFrom, unpackTo and is in google.protobuf.Any.
7366efd 
The previous two methods make it easy to transform between any and normal message.
unPackeTo will throw error if the type url in any doesn't match the type of the message to be transformed to.
is checks any's type url matches the give GPBMessage type.
@TeBoring
Merge pull request protocolbuffers#602 from TeBoring/objectivec
1647e63 
Add packTo and unpackFrom in google.protobuf.Any.
@nico
Remove two unused functions.
58b2dec
@TeBoring
Update minimal ios and osx version for deployment.
d58e95b
@xfxyjwf
Merge pull request protocolbuffers#642 from nico/unused
69d660b 
Remove two unused functions.
@TeBoring
Merge pull request protocolbuffers#635 from TeBoring/objectivec
f642c5c 
Update minimal ios and osx version for deployment.
@LitingLin
A bug about PROTOBUF_LITTLE_ENDIAN remain undefined on MSVC x64
224010c
@LitingLin
Windows is always little-endian.
67d51ac
@xfxyjwf
Merge pull request protocolbuffers#651 from litinglin/master
add3e8d 
On x64 MSVC platform, macro PROTOBUF_LITTLE_ENDIAN won't be set
@TeBoring
Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.h
5da3fb0
@TeBoring
Merge pull request protocolbuffers#652 from TeBoring/objectivec
c6dffbc 
Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.h
@jskeet jskeet mentioned this pull request Jul 30, 2015
Closed
@jtattermusch
Copy link
Contributor

Let's recreate this PR against master.

@jtattermusch
Merge pull request protocolbuffers#664 from jtattermusch/expose_umbre…
b193503 
…lla_class_name2

Expose GetUmbrellaClassName in csharp_names.h
@jtattermusch
Copy link
Contributor

LGTM, please merge into master after rebasing.

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@jskeet
Copy link
Contributor Author

jskeet commented Jul 31, 2015

Looks like I can't change the target branch of the PR. Will close this and create a new one.

@jskeet jskeet closed this Jul 31, 2015
@jskeet jskeet mentioned this pull request Jul 31, 2015
Merged
@jskeet jskeet deleted the types_field branch July 31, 2015 07:13
@KJTsanaktsidis
Copy link
Contributor

Interestingly the C++ generated code also has this problem. The generated code will not compile if a field is called descriptor, default_instance, unknown_fields or mutable_unknown_fields. Also I suspect you'll run into problems if you try and define an optional field called foo and a seperate field called has_foo.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
c# cla: no
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@jskeet @jtattermusch @googlebot @KJTsanaktsidis @paulb777 @TeBoring @nico @xfxyjwf @LitingLin