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

Jump to bottom

Post alpha2 integrate #225

Merged
merged 8 commits into from Mar 4, 2015
Merged

Post alpha2 integrate #225

merged 8 commits into from Mar 4, 2015

Conversation

liujisi
Copy link
Contributor

@liujisi liujisi commented Mar 2, 2015

The first commit is generated by integration script; following commits are manual fixes. @cfallin @xfxyjwf @TeBoring for review.

@liujisi
Down integrate from Google internal branch for C++ and Java.
885b612 
- Maps for C++ lite
- C++ Arena optimizations.
- Java Lite runtime code size optimization.

Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
@liujisi
Add missing files in vsprojects.
b25caa5 
Change-Id: I23abcd7f5ad4a1c6b94b0035ac0441ea874cf55d
@liujisi
Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.
0a25cfe 
Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad
@liujisi
Fix hash_map type parameter to add Alloc for other platforms.
14fe0c9 
Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963
@liujisi
Fix hash.h for MSVC and platforms without hash map/set support.
4065a31 
Change-Id: Ic0fdb52c17b9495c73b8ce15879531383a148585
@liujisi
use is_proto_enum instead of is_enum for repeated accessor field.
f0e8df3 
The later is not supported by some versions of MSVC and the former is
more accurate for the use case.

Change-Id: I7096226b1ebfef8340d288bbaf2788540aa3e97f
@liujisi
Initialize data members in constructors instead of direct initialize in
329fa02 
class definition, which is a C++11 extension.

Change-Id: I477fe484d737f4c60c519d68f431940ffaa33431
@cfallin
Copy link
Contributor

cfallin commented Mar 2, 2015

LGTM, but maybe have @xfxyjwf or @TeBoring check over the maps changes too.

@liujisi
Remove the extra -j8 as it can be passed in $@ already.
0b3cfc7 
Change-Id: I97960f30d50b1635aa6c395377cd021ef5ebddd5
@TeBoring
Copy link
Contributor

TeBoring commented Mar 3, 2015

test for map lite is not merged intentionally. Do we need to merge it now?
Otherwise, LGTM

@liujisi
Copy link
Contributor Author

liujisi commented Mar 3, 2015

Last time I tried it's broken. I added a TODO for you. Feel free to work a fix and re-enable the tests.

@liujisi
Copy link
Contributor Author

liujisi commented Mar 4, 2015

I'll merge the PR for now. We can have another PR to add maps in master.

liujisi added a commit that referenced this pull request Mar 4, 2015
@liujisi
Merge pull request #225 from google/post-alpha2-integrate
ed3c8a1 
Post alpha2 integrate from google internal for C++ and Java
@liujisi liujisi merged commit ed3c8a1 into master Mar 4, 2015
@liujisi liujisi deleted the post-alpha2-integrate branch March 4, 2015 01:51
@liujisi liujisi restored the post-alpha2-integrate branch February 16, 2016 23:35
@liujisi liujisi deleted the post-alpha2-integrate branch May 10, 2016 21:28
@liujisi liujisi restored the post-alpha2-integrate branch March 2, 2018 17:36
@xfxyjwf xfxyjwf deleted the post-alpha2-integrate branch May 23, 2018 18:15
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
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@liujisi @cfallin @TeBoring @xiaofeng-gg @xfxyjwf @googlebot