Index: webrtc/base/ptr_util.h |
diff --git a/webrtc/base/ptr_util.h b/webrtc/base/ptr_util.h |
index 43895c7279f05809a9004ad121d454bfb66cf3ec..aa6f3b4016a506016c8a4c621f99cde77852371c 100644 |
--- a/webrtc/base/ptr_util.h |
+++ b/webrtc/base/ptr_util.h |
@@ -13,70 +13,9 @@ |
#ifndef WEBRTC_BASE_PTR_UTIL_H_ |
#define WEBRTC_BASE_PTR_UTIL_H_ |
-#include <memory> |
-#include <utility> |
-namespace rtc { |
- |
-// Helper to transfer ownership of a raw pointer to a std::unique_ptr<T>. |
-// Note that std::unique_ptr<T> has very different semantics from |
-// std::unique_ptr<T[]>: do not use this helper for array allocations. |
-template <typename T> |
-std::unique_ptr<T> WrapUnique(T* ptr) { |
- return std::unique_ptr<T>(ptr); |
-} |
- |
-namespace internal { |
- |
-template <typename T> |
-struct MakeUniqueResult { |
- using Scalar = std::unique_ptr<T>; |
-}; |
- |
-template <typename T> |
-struct MakeUniqueResult<T[]> { |
- using Array = std::unique_ptr<T[]>; |
-}; |
- |
-template <typename T, size_t N> |
-struct MakeUniqueResult<T[N]> { |
- using Invalid = void; |
-}; |
- |
-} // namespace internal |
- |
-// Helper to construct an object wrapped in a std::unique_ptr. This is an |
-// implementation of C++14's std::make_unique that can be used in Chrome. |
-// |
-// MakeUnique<T>(args) should be preferred over WrapUnique(new T(args)): bare |
-// calls to `new` should be treated with scrutiny. |
-// |
-// Usage: |
-// // ptr is a std::unique_ptr<std::string> |
-// auto ptr = MakeUnique<std::string>("hello world!"); |
-// |
-// // arr is a std::unique_ptr<int[]> |
-// auto arr = MakeUnique<int[]>(5); |
- |
-// Overload for non-array types. Arguments are forwarded to T's constructor. |
-template <typename T, typename... Args> |
-typename internal::MakeUniqueResult<T>::Scalar MakeUnique(Args&&... args) { |
- return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); |
-} |
- |
-// Overload for array types of unknown bound, e.g. T[]. The array is allocated |
-// with `new T[n]()` and value-initialized: note that this is distinct from |
-// `new T[n]`, which default-initializes. |
-template <typename T> |
-typename internal::MakeUniqueResult<T>::Array MakeUnique(size_t size) { |
- return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]()); |
-} |
- |
-// Overload to reject array types of known bound, e.g. T[n]. |
-template <typename T, typename... Args> |
-typename internal::MakeUniqueResult<T>::Invalid MakeUnique(Args&&... args) = |
- delete; |
- |
-} // namespace rtc |
+// This header is deprecated and is just left here temporarily during |
+// refactoring. See https://bugs.webrtc.org/7634 for more details. |
+#include "webrtc/rtc_base/ptr_util.h" |
#endif // WEBRTC_BASE_PTR_UTIL_H_ |