| Index: webrtc/base/refcountedobject.h
|
| diff --git a/webrtc/base/refcountedobject.h b/webrtc/base/refcountedobject.h
|
| index 285ed36b1dca4fa2c02ef1dd5d37907c0b134cf9..78304fa5f5543bd1cf6dbbab986f7ee24b0642f4 100644
|
| --- a/webrtc/base/refcountedobject.h
|
| +++ b/webrtc/base/refcountedobject.h
|
| @@ -10,52 +10,9 @@
|
| #ifndef WEBRTC_BASE_REFCOUNTEDOBJECT_H_
|
| #define WEBRTC_BASE_REFCOUNTEDOBJECT_H_
|
|
|
| -#include <utility>
|
|
|
| -#include "webrtc/base/atomicops.h"
|
| -
|
| -namespace rtc {
|
| -
|
| -template <class T>
|
| -class RefCountedObject : public T {
|
| - public:
|
| - RefCountedObject() {}
|
| -
|
| - template <class P0>
|
| - explicit RefCountedObject(P0&& p0) : T(std::forward<P0>(p0)) {}
|
| -
|
| - template <class P0, class P1, class... Args>
|
| - RefCountedObject(P0&& p0, P1&& p1, Args&&... args)
|
| - : T(std::forward<P0>(p0),
|
| - std::forward<P1>(p1),
|
| - std::forward<Args>(args)...) {}
|
| -
|
| - virtual int AddRef() const { return AtomicOps::Increment(&ref_count_); }
|
| -
|
| - virtual int Release() const {
|
| - int count = AtomicOps::Decrement(&ref_count_);
|
| - if (!count) {
|
| - delete this;
|
| - }
|
| - return count;
|
| - }
|
| -
|
| - // Return whether the reference count is one. If the reference count is used
|
| - // in the conventional way, a reference count of 1 implies that the current
|
| - // thread owns the reference and no other thread shares it. This call
|
| - // performs the test for a reference count of one, and performs the memory
|
| - // barrier needed for the owning thread to act on the object, knowing that it
|
| - // has exclusive access to the object.
|
| - virtual bool HasOneRef() const {
|
| - return AtomicOps::AcquireLoad(&ref_count_) == 1;
|
| - }
|
| -
|
| - protected:
|
| - virtual ~RefCountedObject() {}
|
| -
|
| - mutable volatile int ref_count_ = 0;
|
| -};
|
| -
|
| -} // 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/refcountedobject.h"
|
|
|
| #endif // WEBRTC_BASE_REFCOUNTEDOBJECT_H_
|
|
|