[haiku-commits] haiku: hrev48731 - headers/os/support
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 27 Jan 2015 10:31:32 +0100 (CET)
hrev48731 adds 1 changeset to branch 'master'
old head: 558a3eede11d288ab7b639908198dce2830f73bc
new head: 49e8a3c652c6954b1066b6974479e3412915956e
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=49e8a3c652c6+%5E558a3eede11d
----------------------------------------------------------------------------
49e8a3c652c6: BReferencable: implement const references with specialization
This is simpler and cleaner than my previous attempt. Thanks to Ingo for
suggesting this.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48731
Commit: 49e8a3c652c6954b1066b6974479e3412915956e
URL: http://cgit.haiku-os.org/haiku/commit/?id=49e8a3c652c6
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Tue Jan 27 09:31:08 2015 UTC
----------------------------------------------------------------------------
1 file changed, 91 insertions(+), 25 deletions(-)
headers/os/support/Referenceable.h | 116 ++++++++++++++++++++++++++-------
----------------------------------------------------------------------------
diff --git a/headers/os/support/Referenceable.h
b/headers/os/support/Referenceable.h
index a9af8c6..f95ee81 100644
--- a/headers/os/support/Referenceable.h
+++ b/headers/os/support/Referenceable.h
@@ -37,7 +37,7 @@ protected:
// #pragma mark - BReference
-template<typename Type = BReferenceable, typename ConstType = Type>
+template<typename Type = BReferenceable>
class BReference {
public:
BReference()
@@ -92,34 +92,34 @@ public:
}
}
- ConstType* Get() const
+ Type* Get() const
{
return fObject;
}
- ConstType* Detach()
+ Type* Detach()
{
Type* object = fObject;
fObject = NULL;
return object;
}
- ConstType& operator*() const
+ Type& operator*() const
{
return *fObject;
}
- ConstType* operator->() const
+ Type* operator->() const
{
return fObject;
}
- operator ConstType*() const
+ operator Type*() const
{
return fObject;
}
- BReference& operator=(const BReference<Type, ConstType>& other)
+ BReference& operator=(const BReference<Type>& other)
{
SetTo(other.fObject);
return *this;
@@ -131,14 +131,14 @@ public:
return *this;
}
- template<typename OtherType, typename OtherConstType>
- BReference& operator=(const BReference<OtherType, OtherConstType>&
other)
+ template<typename OtherType>
+ BReference& operator=(const BReference<OtherType>& other)
{
SetTo(other.Get());
return *this;
}
- bool operator==(const BReference<Type, ConstType>& other) const
+ bool operator==(const BReference<Type>& other) const
{
return fObject == other.fObject;
}
@@ -148,7 +148,7 @@ public:
return fObject == other;
}
- bool operator!=(const BReference<Type, ConstType>& other) const
+ bool operator!=(const BReference<Type>& other) const
{
return fObject != other.fObject;
}
@@ -163,38 +163,104 @@ private:
};
-// #pragma mark - BReference
+// #pragma mark - BReference<const>
-template<typename Type = BReferenceable>
-class BConstReference: public BReference<Type, const Type> {
+template<typename Type>
+class BReference<const Type> {
public:
- BConstReference()
+ BReference(Type* object, bool alreadyHasReference = false)
:
- BReference<Type, const Type>()
+ fReference(object, alreadyHasReference)
{
}
- BConstReference(Type* object, bool alreadyHasReference = false)
+ BReference(const BReference<const Type>& other)
:
- BReference<Type, const Type>(object, alreadyHasReference)
+ fReference(other)
{
}
- BConstReference(const BReference<Type>& other)
+ template<typename OtherType>
+ BReference(const BReference<OtherType>& other)
:
- BReference<Type, const Type>(other)
+ fReference(other.Get())
{
}
- // Allow assignment of a const reference from a mutable one (but not the
- // reverse).
- BConstReference& operator=(const BReference<Type, Type>& other)
+ void SetTo(Type* object, bool alreadyHasReference = false)
{
- SetTo(other.Get());
- return *this;
+ fReference.SetTo(object, alreadyHasReference);
+ }
+
+ void Unset()
+ {
+ fReference.Unset();
}
+ const Type* Get() const
+ {
+ return fReference.Get();
+ }
+
+ const Type* Detach()
+ {
+ return fReference.Detach();
+ }
+
+ const Type& operator*() const
+ {
+ return *fReference;
+ }
+
+ const Type* operator->() const
+ {
+ return fReference.Get();
+ }
+
+ operator const Type*() const
+ {
+ return fReference.Get();
+ }
+
+ BReference& operator=(const BReference<const Type>& other)
+ {
+ fReference = other.fReference;
+ }
+
+ BReference& operator=(Type* other)
+ {
+ fReference = other;
+ }
+
+ template<typename OtherType>
+ BReference& operator=(const BReference<OtherType>& other)
+ {
+ fReference = other.Get();
+ }
+
+ bool operator==(const BReference<const Type>& other) const
+ {
+ return fReference == other.Get();
+ }
+
+ bool operator==(const Type* other) const
+ {
+ return fReference == other;
+ }
+
+ bool operator!=(const BReference<const Type>& other) const
+ {
+ return fReference != other.Get();
+ }
+
+ bool operator!=(const Type* other) const
+ {
+ return fReference != other;
+ }
+
+private:
+ BReference<Type> fReference;
};
Other related posts:
- » [haiku-commits] haiku: hrev48731 - headers/os/support - pulkomandy
