Post alpha2 integrate - #225
Merged
Merged
Conversation
- Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
Change-Id: I23abcd7f5ad4a1c6b94b0035ac0441ea874cf55d
Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad
Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963
Change-Id: Ic0fdb52c17b9495c73b8ce15879531383a148585
The later is not supported by some versions of MSVC and the former is more accurate for the use case. Change-Id: I7096226b1ebfef8340d288bbaf2788540aa3e97f
class definition, which is a C++11 extension. Change-Id: I477fe484d737f4c60c519d68f431940ffaa33431
Contributor
Change-Id: I97960f30d50b1635aa6c395377cd021ef5ebddd5
Contributor
|
test for map lite is not merged intentionally. Do we need to merge it now? |
Contributor
Author
|
Last time I tried it's broken. I added a TODO for you. Feel free to work a fix and re-enable the tests. |
Contributor
Author
|
I'll merge the PR for now. We can have another PR to add maps in master. |
liujisi
pushed a commit
that referenced
this pull request
Mar 4, 2015
Post alpha2 integrate from google internal for C++ and Java
yordis
pushed a commit
to yordis/protobuf
that referenced
this pull request
Dec 8, 2024
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
6 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.
The first commit is generated by integration script; following commits are manual fixes. @cfallin @xfxyjwf @TeBoring for review.