6776518bea
This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
83 lines
2.5 KiB
C++
83 lines
2.5 KiB
C++
/*
|
|
* Copyright 2017 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.
|
|
*/
|
|
|
|
// This implementation is borrowed from chromium.
|
|
|
|
#ifndef WEBRTC_RTC_BASE_PTR_UTIL_H_
|
|
#define WEBRTC_RTC_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
|
|
|
|
#endif // WEBRTC_RTC_BASE_PTR_UTIL_H_
|