From 6b7bf6ab0ccbb79a3c08f72916986e6215daa40e Mon Sep 17 00:00:00 2001 From: tzik Date: Thu, 28 Feb 2019 22:09:59 +0900 Subject: [PATCH] Add a presubmit check for absl/memory/memory.h inclusion for WrapUnique This fixes a build error on C++17 mode due to missing #include, plus adds a presubmit check to prevent further breakage. Bug: chromium:752720 Change-Id: I5c7d1dca0079dfe7a042650402e6f7ae28a797ba Reviewed-on: https://webrtc-review.googlesource.com/c/124940 Commit-Queue: Taiju Tsuiki Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#26898} --- PRESUBMIT.py | 7 ++++--- .../events/rtc_event_generic_packet_received.cc | 2 ++ .../rtc_event_log/events/rtc_event_generic_packet_sent.cc | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index bc4eaf2721..4dd6a32161 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -955,15 +955,16 @@ def CheckAbslMemoryInclude(input_api, output_api, source_file_filter): if pattern.search(contents): continue for _, line in f.ChangedContents(): - if 'absl::make_unique' in line: + if 'absl::make_unique' in line or 'absl::WrapUnique' in line: files.append(f) break if len(files): return [output_api.PresubmitError( 'Please include "absl/memory/memory.h" header for' - ' absl::make_unique.\nThis header may or may not be included' - ' transitively depends on the C++ standard version.', + ' absl::make_unique or absl::WrapUnique.\nThis header may or' + ' may not be included transitively depending on the C++ standard' + ' version.', files)] return [] diff --git a/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc b/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc index 9b87f14e5c..92558b29dd 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc +++ b/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc @@ -10,6 +10,8 @@ #include "logging/rtc_event_log/events/rtc_event_generic_packet_received.h" +#include "absl/memory/memory.h" + namespace webrtc { RtcEventGenericPacketReceived::RtcEventGenericPacketReceived( diff --git a/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc b/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc index f640d091f2..ef761d5e9d 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc +++ b/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc @@ -10,6 +10,8 @@ #include "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h" +#include "absl/memory/memory.h" + namespace webrtc { RtcEventGenericPacketSent::RtcEventGenericPacketSent(int64_t packet_number,