diff options
| author | Mirko Bonadei <mbonadei@webrtc.org> | 2019-09-17 17:06:18 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-09-17 15:47:29 +0000 |
| commit | 317a1f09ed232bc16e67f6588ecf1b5deabbf928 (patch) | |
| tree | fc0fbae9b5d346dbd3587c25e66aa377dd99f017 /common_video | |
| parent | 809198edfff416fce8d75b574a43afab5e67b1cd (diff) | |
| download | webrtc-317a1f09ed232bc16e67f6588ecf1b5deabbf928.tar.gz | |
Use std::make_unique instead of absl::make_unique.
WebRTC is now using C++14 so there is no need to use the Abseil version
of std::make_unique.
This CL has been created with the following steps:
git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt
git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt
git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt
diff --new-line-format="" --unchanged-line-format="" \
/tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \
uniq > /tmp/only_make_unique.txt
diff --new-line-format="" --unchanged-line-format="" \
/tmp/only_make_unique.txt /tmp/memory.txt | \
xargs grep -l "absl/memory" > /tmp/add-memory.txt
git grep -l "\babsl::make_unique\b" | \
xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g"
git checkout PRESUBMIT.py abseil-in-webrtc.md
cat /tmp/add-memory.txt | \
xargs sed -i \
's/#include "absl\/memory\/memory.h"/#include <memory>/g'
git cl format
# Manual fix order of the new inserted #include <memory>
cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \
xargs sed -i '/#include "absl\/memory\/memory.h"/d'
git ls-files | grep BUILD.gn | \
xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d'
python tools_webrtc/gn_check_autofix.py \
-m tryserver.webrtc -b linux_rel
# Repead the gn_check_autofix step for other platforms
git ls-files | grep BUILD.gn | \
xargs sed -i 's/absl\/memory:memory/absl\/memory/g'
git cl format
Bug: webrtc:10945
Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29209}
Diffstat (limited to 'common_video')
| -rw-r--r-- | common_video/BUILD.gn | 1 | ||||
| -rw-r--r-- | common_video/libyuv/libyuv_unittest.cc | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index c0cd959948..c2c0bc223f 100644 --- a/common_video/BUILD.gn +++ b/common_video/BUILD.gn @@ -113,7 +113,6 @@ if (rtc_include_tests) { "../test:test_support", "../test:video_test_common", "//testing/gtest", - "//third_party/abseil-cpp/absl/memory", "//third_party/libyuv", ] diff --git a/common_video/libyuv/libyuv_unittest.cc b/common_video/libyuv/libyuv_unittest.cc index 68c45019c3..2a7992865a 100644 --- a/common_video/libyuv/libyuv_unittest.cc +++ b/common_video/libyuv/libyuv_unittest.cc @@ -15,7 +15,6 @@ #include <memory> -#include "absl/memory/memory.h" #include "api/video/i420_buffer.h" #include "api/video/video_frame.h" #include "common_video/libyuv/include/webrtc_libyuv.h" @@ -69,11 +68,11 @@ void TestLibYuv::SetUp() { test::ReadI420Buffer(width_, height_, source_file_)); orig_frame_ = - absl::make_unique<VideoFrame>(VideoFrame::Builder() - .set_video_frame_buffer(buffer) - .set_rotation(webrtc::kVideoRotation_0) - .set_timestamp_us(0) - .build()); + std::make_unique<VideoFrame>(VideoFrame::Builder() + .set_video_frame_buffer(buffer) + .set_rotation(webrtc::kVideoRotation_0) + .set_timestamp_us(0) + .build()); } void TestLibYuv::TearDown() { |