From 365a5717ae0defda2ec179c866290801543b0307 Mon Sep 17 00:00:00 2001 From: Emil Lundmark Date: Tue, 27 Jun 2023 11:35:22 +0200 Subject: [PATCH] Use absl::optional instead of std::optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We haven't switched to the std spelling in WebRTC yet. Change-Id: If21a6ee9ac19be8ce959b3192eb8de044048f157 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/310501 Auto-Submit: Emil Lundmark Commit-Queue: Erik Språng Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/main@{#40356} --- modules/rtp_rtcp/source/rtcp_transceiver_impl.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc index 69ecddc354..625cb7fefc 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc +++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc @@ -15,6 +15,7 @@ #include "absl/algorithm/container.h" #include "absl/memory/memory.h" +#include "absl/types/optional.h" #include "api/video/video_bitrate_allocation.h" #include "modules/rtp_rtcp/include/receive_statistics.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" @@ -365,7 +366,7 @@ void RtcpTransceiverImpl::HandleReportBlocks( Timestamp::Millis(now_ntp.ToMs() - rtc::kNtpJan1970Millisecs); for (const rtcp::ReportBlock& block : rtcp_report_blocks) { - std::optional rtt; + absl::optional rtt; if (block.last_sr() != 0) { rtt = CompactNtpRttToTimeDelta( receive_time_ntp - block.delay_since_last_sr() - block.last_sr());