Skip to content

Commit

Permalink
Use absl::optional instead or rtc::Optional
Browse files Browse the repository at this point in the history
BUG: webrtc:9078
Change-Id: I69aedce324d86e8894b81210a2de17c5ef68fd11
Reviewed-on: https://webrtc-review.googlesource.com/77082
Commit-Queue: Danil Chapovalov <[email protected]>
Reviewed-by: Karl Wiberg <[email protected]>
Reviewed-by: Mirko Bonadei <[email protected]>
Cr-Commit-Position: refs/heads/master@{#23440}
  • Loading branch information
DanilChapovalov authored and Commit Bot committed May 30, 2018
1 parent 700fc84 commit 7ba9e92
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 490 deletions.
3 changes: 3 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -734,4 +734,7 @@ include_rules = [
"+rtc_base",
"+test",
"+rtc_tools",

# Abseil whitelist.
"+absl/types/optional.h",
]
10 changes: 6 additions & 4 deletions api/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,15 @@ rtc_source_set("array_view") {
]
}

# TODO(bugs.webrtc.org/9078): Deprecated, replaced by absl/types:optional.
# Delete after webrtc and downstreams users are updated.
rtc_source_set("optional") {
visibility = [ "*" ]
sources = [
"optional.cc",
"optional.h",
]
deps = [
":array_view",
"../rtc_base:checks",
"../rtc_base:sanitizer",
"//third_party/abseil-cpp/absl/types:optional",
]
}

Expand Down Expand Up @@ -381,6 +380,9 @@ if (rtc_include_tests) {

sources = [
"array_view_unittest.cc",

# TODO(bugs.webrtc.org/8821): Remove optional_unittests when webrtc starts
# running absl unittest on each commit.
"optional_unittest.cc",
"ortc/mediadescription_unittest.cc",
"ortc/sessiondescription_unittest.cc",
Expand Down
34 changes: 0 additions & 34 deletions api/optional.cc

This file was deleted.

Loading

0 comments on commit 7ba9e92

Please sign in to comment.