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.

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

Update csharp-experimental with changes from upstream/master #606

Conversation

jtattermusch
Copy link
Contributor

This also seems to revert the changes you've made in wire_format.h. So I think this fixes #519 - how would we verify?

xfxyjwf and others added 25 commits June 2, 2015 22:26
proto3 primitive repeated fields, packed data cannot be parsed if
definition is unpacked. Neither is the other way.
Change-Id: I63ed5fb58a45e098f2fd1fa457a219148de030bd
- control reaches end of non-void function.
- remove a deprecated IsMatch.

Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
Fix "sometimes-uninitialized" warning on Windows Clang.
Delete default UnknownFieldSet when shuting down.
Implement parsing for proto3 primitive repeated fields.
Also add WKT headers to the umbrella file, and simplify Podspec with it.
Plus some layout improvements to the BUILD file.
Add Bazel target for the Objective-C protobuf runtime
Change-Id: I8e2b425f9008e6b82d41d59783bb8b04af1f886f
Fixes: protocolbuffers#474.
Worked around memory leak bug in Ruby interpreter.
This was enabled by the recent open-sourcing of JSON
support and MessageDifferencer.

MessageDifferencer allows the conformance suite to expand
because it allows us to write tests for payloads that parse
successfully.  To verify the testee's output payload, we
need to parse it back into a message and compare the message
instances.  Comparing output bytes vs. a golden message is
*not* valid, because protobufs do not have a canonical
encoding (especially in the presence of maps, which have
no prescribed serialization order).

We only add one small JSON test for now, but with the
framework in place we now have the foundation to dramatically
expand the coverage of the conformance test suite.

Also added the ability for the testee to skip tests that
exercise features that are unimplemented.  This allows
Java (which currently has no JSON support) to skip tests
involving JSON.

Change-Id: I697b4363da432b61ae3b638b4287c4cda1af4deb
Added support for JSON and valid input to conformance tests.
Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
remove pbconfig from extract script
@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.

@jtattermusch
Copy link
Contributor Author

CLA is fine, these are changes coming from upstream/master.

@jskeet
Copy link
Contributor

jskeet commented Jul 16, 2015

I think I reverted the changes to wire_format.h myself a while ago - I have a later commit which adds a local fixup. (It should still be done by someone, but not me...) Will close that issue with a note.

Assuming everything merges cleanly, is there anything you particularly want me to look at here? I'm happy for us to merge otherwise.

@jtattermusch
Copy link
Contributor Author

wire_format.h was my major concern. Besides that, everything looks fine to me.

@jskeet
Copy link
Contributor

jskeet commented Jul 16, 2015

Great. Will merge and rebase my pending changes.

jskeet added a commit that referenced this pull request Jul 16, 2015
Update csharp-experimental with changes from upstream/master
@jskeet jskeet merged commit 19cf9d1 into protocolbuffers:csharp-experimental Jul 16, 2015
adellahlou pushed a commit to adellahlou/protobuf that referenced this pull request Apr 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants