commit b661c658daed36150c8edbe0156f397d3ece0b1c
author Ilya Nikolaevskiy <ilnik@webrtc.org> Wed Jul 11 07:41:34 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Jul 11 07:41:41 2018 +0000
tree 7be94bcfb74af89c3401d44e1566af680963c1aa
parent 2d82adea037fc1260ea24a8f6670d0e4aa985c39

Revert "Remove rtc::Optional alias and api:optional target"

This reverts commit 6f5b0f920af08d66e6b77ee4f91ade5797145368.

Reason for revert: Breaks internal project.

Original change's description:
> Remove rtc::Optional alias and api:optional target
> 
> Update left-overs where old target still was used.
> 
> Bug: webrtc:9078
> Change-Id: I2162c928091fc4ff1dea33a3f03adbe47207d206
> Reviewed-on: https://webrtc-review.googlesource.com/84740
> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#23913}

TBR=danilchap@webrtc.org,kwiberg@webrtc.org

Change-Id: I95f5ec33520b823c3d0c9cb83d945d6a15355367
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9078
Reviewed-on: https://webrtc-review.googlesource.com/88140
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23921}

modules/audio_coding/neteq/tools/neteq_input.cc

diff --git a/modules/audio_coding/neteq/tools/neteq_input.cc b/modules/audio_coding/neteq/tools/neteq_input.cc
index fed3ecc..12a75fc 100644
--- a/modules/audio_coding/neteq/tools/neteq_input.cc
+++ b/modules/audio_coding/neteq/tools/neteq_input.cc
@@ -34,12 +34,12 @@
       start_time_ms_(input_->NextEventTime()),
       duration_ms_(duration_ms) {}
 
-absl::optional<int64_t> TimeLimitedNetEqInput::NextPacketTime() const {
-  return ended_ ? absl::nullopt : input_->NextPacketTime();
+rtc::Optional<int64_t> TimeLimitedNetEqInput::NextPacketTime() const {
+  return ended_ ? rtc::Optional<int64_t>() : input_->NextPacketTime();
 }
 
-absl::optional<int64_t> TimeLimitedNetEqInput::NextOutputEventTime() const {
-  return ended_ ? absl::nullopt : input_->NextOutputEventTime();
+rtc::Optional<int64_t> TimeLimitedNetEqInput::NextOutputEventTime() const {
+  return ended_ ? rtc::Optional<int64_t>() : input_->NextOutputEventTime();
 }
 
 std::unique_ptr<NetEqInput::PacketData> TimeLimitedNetEqInput::PopPacket() {
@@ -62,8 +62,8 @@
   return ended_ || input_->ended();
 }
 
-absl::optional<RTPHeader> TimeLimitedNetEqInput::NextHeader() const {
-  return ended_ ? absl::nullopt : input_->NextHeader();
+rtc::Optional<RTPHeader> TimeLimitedNetEqInput::NextHeader() const {
+  return ended_ ? rtc::Optional<RTPHeader>() : input_->NextHeader();
 }
 
 void TimeLimitedNetEqInput::MaybeSetEnded() {