Skip to content

Merge updated abseil to master #1112

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
Merged
merged 6 commits into from
Apr 17, 2018
Merged

Merge updated abseil to master #1112

merged 6 commits into from
Apr 17, 2018

Conversation

wilhuff
Copy link
Contributor

@wilhuff wilhuff commented Apr 15, 2018

This pulls the new pristine upstream sources added in #1111 into master.

Local modifications are in 37ad4f6

zxu123 and others added 4 commits April 13, 2018 14:30
@zxu123
carbon-copy of the optional-relevant src from abseil (#1083)
c1061b7
@wilhuff
Update abseil-cpp to a new upstream
dfb5c04 
Actually update to bf7fc9986e20f664958fc227547fd8d2fdcf863e

Change #754 didn't completely do this.

This makes the rest of the sources match optional, which was imported at
this change in #1083.

Also add:
  absl/types/optional_test.cc
  absl/types/CMakeLists.txt
  absl/utility/CMakeLists.txt
@wilhuff
Merge branch 'abseil-update' into abseil-merge
fdaf3cf
@wilhuff
Make abseil-cpp buildable on master
37ad4f6
@wilhuff wilhuff requested a review from zxu123 April 15, 2018 23:55
This was referenced Apr 16, 2018
Closed
Closed
zxu123
zxu123 approved these changes Apr 17, 2018
View reviewed changes
Copy link
Contributor

@zxu123 zxu123 left a comment

Choose a reason for hiding this comment

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

local modification LGTM

@wilhuff wilhuff merged commit 1c44352 into master Apr 17, 2018
@wilhuff wilhuff deleted the wilhuff/abseil-merge branch April 17, 2018 20:19
minafarid pushed a commit to minafarid/firebase-ios-sdk that referenced this pull request Jun 6, 2018
@wilhuff
Merge pull request firebase#1112 from firebase/wilhuff/abseil-merge
90517b7 
Merge updated abseil to master
@firebase firebase locked and limited conversation to collaborators Nov 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@zxu123 zxu123 zxu123 approved these changes

Assignees

@zxu123 zxu123

Labels
api: firestore cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wilhuff @zxu123 @googlebot