mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
317a1f09ed
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}
72 lines
2.4 KiB
C++
72 lines
2.4 KiB
C++
/*
|
|
* Copyright 2019 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef RTC_BASE_TASK_UTILS_TO_QUEUED_TASK_H_
|
|
#define RTC_BASE_TASK_UTILS_TO_QUEUED_TASK_H_
|
|
|
|
#include <memory>
|
|
#include <type_traits>
|
|
#include <utility>
|
|
|
|
#include "api/task_queue/queued_task.h"
|
|
|
|
namespace webrtc {
|
|
namespace webrtc_new_closure_impl {
|
|
// Simple implementation of QueuedTask for use with rtc::Bind and lambdas.
|
|
template <typename Closure>
|
|
class ClosureTask : public QueuedTask {
|
|
public:
|
|
explicit ClosureTask(Closure&& closure)
|
|
: closure_(std::forward<Closure>(closure)) {}
|
|
|
|
private:
|
|
bool Run() override {
|
|
closure_();
|
|
return true;
|
|
}
|
|
|
|
typename std::decay<Closure>::type closure_;
|
|
};
|
|
|
|
// Extends ClosureTask to also allow specifying cleanup code.
|
|
// This is useful when using lambdas if guaranteeing cleanup, even if a task
|
|
// was dropped (queue is too full), is required.
|
|
template <typename Closure, typename Cleanup>
|
|
class ClosureTaskWithCleanup : public ClosureTask<Closure> {
|
|
public:
|
|
ClosureTaskWithCleanup(Closure&& closure, Cleanup&& cleanup)
|
|
: ClosureTask<Closure>(std::forward<Closure>(closure)),
|
|
cleanup_(std::forward<Cleanup>(cleanup)) {}
|
|
~ClosureTaskWithCleanup() override { cleanup_(); }
|
|
|
|
private:
|
|
typename std::decay<Cleanup>::type cleanup_;
|
|
};
|
|
} // namespace webrtc_new_closure_impl
|
|
|
|
// Convenience function to construct closures that can be passed directly
|
|
// to methods that support std::unique_ptr<QueuedTask> but not template
|
|
// based parameters.
|
|
template <typename Closure>
|
|
std::unique_ptr<QueuedTask> ToQueuedTask(Closure&& closure) {
|
|
return std::make_unique<webrtc_new_closure_impl::ClosureTask<Closure>>(
|
|
std::forward<Closure>(closure));
|
|
}
|
|
|
|
template <typename Closure, typename Cleanup>
|
|
std::unique_ptr<QueuedTask> ToQueuedTask(Closure&& closure, Cleanup&& cleanup) {
|
|
return std::make_unique<
|
|
webrtc_new_closure_impl::ClosureTaskWithCleanup<Closure, Cleanup>>(
|
|
std::forward<Closure>(closure), std::forward<Cleanup>(cleanup));
|
|
}
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // RTC_BASE_TASK_UTILS_TO_QUEUED_TASK_H_
|