Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/base/refcount.h

Issue 2036123002: Add r-value constructor for RefCountedObject. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/desktop_capture/shared_desktop_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/refcount.h
diff --git a/webrtc/base/refcount.h b/webrtc/base/refcount.h
index 55ce23a348b68a84ce362d98f85c0f871725303a..9e881c85bd811b5a32b34be7525ae3f6950cd66c 100644
--- a/webrtc/base/refcount.h
+++ b/webrtc/base/refcount.h
@@ -12,6 +12,7 @@
#define WEBRTC_BASE_REFCOUNT_H_
#include <string.h>
+#include <utility>
#include "webrtc/base/atomicops.h"
@@ -22,6 +23,7 @@ class RefCountInterface {
public:
virtual int AddRef() const = 0;
virtual int Release() const = 0;
+
protected:
virtual ~RefCountInterface() {}
};
@@ -29,75 +31,123 @@ class RefCountInterface {
template <class T>
class RefCountedObject : public T {
public:
- RefCountedObject() : ref_count_(0) {
- }
+ RefCountedObject() {}
- template<typename P>
- explicit RefCountedObject(P p) : T(p), ref_count_(0) {
- }
+ template <typename P>
+ explicit RefCountedObject(const P& p) : T(p) {}
- template<typename P1, typename P2>
- RefCountedObject(P1 p1, P2 p2) : T(p1, p2), ref_count_(0) {
- }
+ template <typename P>
+ explicit RefCountedObject(P&& p) : T(std::move(p)) {}
- template<typename P1, typename P2, typename P3>
- RefCountedObject(P1 p1, P2 p2, P3 p3) : T(p1, p2, p3), ref_count_(0) {
- }
+ template <typename P1, typename P2>
+ RefCountedObject(P1 p1, P2 p2) : T(p1, p2) {}
- template<typename P1, typename P2, typename P3, typename P4>
- RefCountedObject(P1 p1, P2 p2, P3 p3, P4 p4)
- : T(p1, p2, p3, p4), ref_count_(0) {
- }
+ template <typename P1, typename P2, typename P3>
+ RefCountedObject(P1 p1, P2 p2, P3 p3) : T(p1, p2, p3) {}
- template<typename P1, typename P2, typename P3, typename P4, typename P5>
- RefCountedObject(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5)
- : T(p1, p2, p3, p4, p5), ref_count_(0) {
- }
+ template <typename P1, typename P2, typename P3, typename P4>
+ RefCountedObject(P1 p1, P2 p2, P3 p3, P4 p4) : T(p1, p2, p3, p4) {}
- template<typename P1, typename P2, typename P3, typename P4, typename P5,
- typename P6>
- RefCountedObject(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6)
- : T(p1, p2, p3, p4, p5, p6), ref_count_(0) {
- }
+ template <typename P1, typename P2, typename P3, typename P4, typename P5>
+ RefCountedObject(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : T(p1, p2, p3, p4, p5) {}
- template<typename P1, typename P2, typename P3, typename P4, typename P5,
- typename P6, typename P7>
+ template <typename P1,
+ typename P2,
+ typename P3,
+ typename P4,
+ typename P5,
+ typename P6>
+ RefCountedObject(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6)
+ : T(p1, p2, p3, p4, p5, p6) {}
+
+ template <typename P1,
+ typename P2,
+ typename P3,
+ typename P4,
+ typename P5,
+ typename P6,
+ typename P7>
RefCountedObject(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7)
- : T(p1, p2, p3, p4, p5, p6, p7), ref_count_(0) {
- }
-
- template<typename P1, typename P2, typename P3, typename P4, typename P5,
- typename P6, typename P7, typename P8>
+ : T(p1, p2, p3, p4, p5, p6, p7) {}
+
+ template <typename P1,
+ typename P2,
+ typename P3,
+ typename P4,
+ typename P5,
+ typename P6,
+ typename P7,
+ typename P8>
RefCountedObject(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8)
- : T(p1, p2, p3, p4, p5, p6, p7, p8), ref_count_(0) {
- }
-
- template<typename P1, typename P2, typename P3, typename P4, typename P5,
- typename P6, typename P7, typename P8, typename P9>
- RefCountedObject(
- P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9)
- : T(p1, p2, p3, p4, p5, p6, p7, p8, p9), ref_count_(0) {
- }
-
- template<typename P1, typename P2, typename P3, typename P4, typename P5,
- typename P6, typename P7, typename P8, typename P9, typename P10>
- RefCountedObject(
- P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10)
- : T(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), ref_count_(0) {
- }
-
- template<typename P1, typename P2, typename P3, typename P4, typename P5,
- typename P6, typename P7, typename P8, typename P9, typename P10,
- typename P11>
- RefCountedObject(
- P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10,
- P11 p11)
- : T(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), ref_count_(0) {
- }
-
- virtual int AddRef() const {
- return AtomicOps::Increment(&ref_count_);
- }
+ : T(p1, p2, p3, p4, p5, p6, p7, p8) {}
+
+ template <typename P1,
+ typename P2,
+ typename P3,
+ typename P4,
+ typename P5,
+ typename P6,
+ typename P7,
+ typename P8,
+ typename P9>
+ RefCountedObject(P1 p1,
+ P2 p2,
+ P3 p3,
+ P4 p4,
+ P5 p5,
+ P6 p6,
+ P7 p7,
+ P8 p8,
+ P9 p9)
+ : T(p1, p2, p3, p4, p5, p6, p7, p8, p9) {}
+
+ template <typename P1,
+ typename P2,
+ typename P3,
+ typename P4,
+ typename P5,
+ typename P6,
+ typename P7,
+ typename P8,
+ typename P9,
+ typename P10>
+ RefCountedObject(P1 p1,
+ P2 p2,
+ P3 p3,
+ P4 p4,
+ P5 p5,
+ P6 p6,
+ P7 p7,
+ P8 p8,
+ P9 p9,
+ P10 p10)
+ : T(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10) {}
+
+ template <typename P1,
+ typename P2,
+ typename P3,
+ typename P4,
+ typename P5,
+ typename P6,
+ typename P7,
+ typename P8,
+ typename P9,
+ typename P10,
+ typename P11>
+ RefCountedObject(P1 p1,
+ P2 p2,
+ P3 p3,
+ P4 p4,
+ P5 p5,
+ P6 p6,
+ P7 p7,
+ P8 p8,
+ P9 p9,
+ P10 p10,
+ P11 p11)
+ : T(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11) {}
+
+ virtual int AddRef() const { return AtomicOps::Increment(&ref_count_); }
virtual int Release() const {
int count = AtomicOps::Decrement(&ref_count_);
@@ -118,10 +168,9 @@ class RefCountedObject : public T {
}
protected:
- virtual ~RefCountedObject() {
- }
+ virtual ~RefCountedObject() {}
- mutable volatile int ref_count_;
+ mutable volatile int ref_count_ = 0;
};
} // namespace rtc
« no previous file with comments | « no previous file | webrtc/modules/desktop_capture/shared_desktop_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698