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

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 added 6 commits Mar 1, 2015
- 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
@cfallin
Copy link
Contributor

@cfallin cfallin commented Mar 2, 2015

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

Change-Id: I97960f30d50b1635aa6c395377cd021ef5ebddd5
@TeBoring
Copy link
Contributor

@TeBoring 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 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 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 issue Mar 4, 2015
Post alpha2 integrate from google internal for C++ and Java
@liujisi liujisi merged commit ed3c8a1 into master Mar 4, 2015
3 checks passed
@liujisi liujisi deleted the post-alpha2-integrate branch Mar 4, 2015
xfxyjwf
Copy link
Contributor

@xfxyjwf xfxyjwf commented on 4065a31 Jul 6, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::map only takes 4 type parameters. How is this code compiled?

liujisi
Copy link
Contributor Author

@liujisi liujisi commented on 4065a31 Jul 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I didn't remember. The HashFcn, probably doesn't work as the key compare function either for std::map and std::set. Is this reported by some users?

xiaofeng-gg
Copy link

@xiaofeng-gg xiaofeng-gg commented on 4065a31 Jul 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@liujisi liujisi restored the post-alpha2-integrate branch Feb 16, 2016
@liujisi liujisi deleted the post-alpha2-integrate branch May 10, 2016
@liujisi liujisi restored the post-alpha2-integrate branch Mar 2, 2018
@xfxyjwf xfxyjwf deleted the post-alpha2-integrate branch May 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants