mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move scoped_refptr from rtc:: to webrtc::

Browse source 
leaving a compatible alias.

Bug: webrtc:15622
Change-Id: Ie25d87fa372cc71eaf52882454f4dd24c7c33789
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325462
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41072}
This commit is contained in:
Harald Alvestrand 2023-11-02 14:09:30 +00:00 committed by WebRTC LUCI CQ
parent 414ffac4b7
commit 23cecc1d43
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
api/scoped_refptr.h
View file

@ -66,7 +66,7 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
namespace rtc { namespace webrtc {
template <class T> template <class T>
class scoped_refptr { class scoped_refptr {
@ -162,61 +162,66 @@ class scoped_refptr {
}; };
template <typename T, typename U> template <typename T, typename U>
bool operator==(const rtc::scoped_refptr<T>& a, bool operator==(const scoped_refptr<T>& a, const scoped_refptr<U>& b) {
const rtc::scoped_refptr<U>& b) {
return a.get() == b.get(); return a.get() == b.get();
} }
template <typename T, typename U> template <typename T, typename U>
bool operator!=(const rtc::scoped_refptr<T>& a, bool operator!=(const scoped_refptr<T>& a, const scoped_refptr<U>& b) {
const rtc::scoped_refptr<U>& b) {
return !(a == b); return !(a == b);
} }
template <typename T> template <typename T>
bool operator==(const rtc::scoped_refptr<T>& a, std::nullptr_t) { bool operator==(const scoped_refptr<T>& a, std::nullptr_t) {
return a.get() == nullptr; return a.get() == nullptr;
} }
template <typename T> template <typename T>
bool operator!=(const rtc::scoped_refptr<T>& a, std::nullptr_t) { bool operator!=(const scoped_refptr<T>& a, std::nullptr_t) {
return !(a == nullptr); return !(a == nullptr);
} }
template <typename T> template <typename T>
bool operator==(std::nullptr_t, const rtc::scoped_refptr<T>& a) { bool operator==(std::nullptr_t, const scoped_refptr<T>& a) {
return a.get() == nullptr; return a.get() == nullptr;
} }
template <typename T> template <typename T>
bool operator!=(std::nullptr_t, const rtc::scoped_refptr<T>& a) { bool operator!=(std::nullptr_t, const scoped_refptr<T>& a) {
return !(a == nullptr); return !(a == nullptr);
} }
// Comparison with raw pointer. // Comparison with raw pointer.
template <typename T, typename U> template <typename T, typename U>
bool operator==(const rtc::scoped_refptr<T>& a, const U* b) { bool operator==(const scoped_refptr<T>& a, const U* b) {
return a.get() == b; return a.get() == b;
} }
template <typename T, typename U> template <typename T, typename U>
bool operator!=(const rtc::scoped_refptr<T>& a, const U* b) { bool operator!=(const scoped_refptr<T>& a, const U* b) {
return !(a == b); return !(a == b);
} }
template <typename T, typename U> template <typename T, typename U>
bool operator==(const T* a, const rtc::scoped_refptr<U>& b) { bool operator==(const T* a, const scoped_refptr<U>& b) {
return a == b.get(); return a == b.get();
} }
template <typename T, typename U> template <typename T, typename U>
bool operator!=(const T* a, const rtc::scoped_refptr<U>& b) { bool operator!=(const T* a, const scoped_refptr<U>& b) {
return !(a == b); return !(a == b);
} }
// Ordered comparison, needed for use as a std::map key. // Ordered comparison, needed for use as a std::map key.
template <typename T, typename U> template <typename T, typename U>
bool operator<(const rtc::scoped_refptr<T>& a, const rtc::scoped_refptr<U>& b) { bool operator<(const scoped_refptr<T>& a, const scoped_refptr<U>& b) {
return a.get() < b.get(); return a.get() < b.get();
} }
} // namespace webrtc
namespace rtc {
// Backwards compatible alias.
// TODO(bugs.webrtc.org/15622): Deprecate and remove.
template <typename T>
using scoped_refptr = webrtc::scoped_refptr<T>;
} // namespace rtc } // namespace rtc
#endif // API_SCOPED_REFPTR_H_ #endif // API_SCOPED_REFPTR_H_

2
modules/desktop_capture/win/dxgi_duplicator_controller.h
View file

@ -132,7 +132,7 @@ class RTC_EXPORT DxgiDuplicatorController {
// scoped_refptr<DxgiDuplicatorController> accesses private AddRef() and // scoped_refptr<DxgiDuplicatorController> accesses private AddRef() and
// Release() functions. // Release() functions.
friend class rtc::scoped_refptr<DxgiDuplicatorController>; friend class webrtc::scoped_refptr<DxgiDuplicatorController>;
// A private constructor to ensure consumers to use // A private constructor to ensure consumers to use
// DxgiDuplicatorController::Instance(). // DxgiDuplicatorController::Instance().