From f2dd438a7d4bd03357f16e3c9fdb011b953d16fc Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Fri, 15 Jul 2016 21:22:11 +0200
Subject: [PATCH] [DEBUG] correct some errors

---
 ememory/EnableSharedFromThis.h |  2 +-
 ememory/SharedPtr.h            | 17 +++++++++++++++++
 ememory/WeakPtr.h              |  1 +
 ememory/details/SharedPtr.hxx  | 23 +++++++++++++++++++++++
 ememory/details/WeakPtr.hxx    |  7 +++++++
 ememory/memory.h               | 11 ++++++++---
 6 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/ememory/EnableSharedFromThis.h b/ememory/EnableSharedFromThis.h
index 85274e9..f057ca9 100644
--- a/ememory/EnableSharedFromThis.h
+++ b/ememory/EnableSharedFromThis.h
@@ -16,7 +16,7 @@ namespace ememory {
 	class EnableSharedFromThis {
 		friend class ememory::SharedPtr<EMEMORY_TYPE>;
 		private:
-			ememory::WeakPtr<EMEMORY_TYPE> m_weakThis;
+			mutable ememory::WeakPtr<EMEMORY_TYPE> m_weakThis;
 		protected:
 			EnableSharedFromThis();
 			virtual ~EnableSharedFromThis() = default;
diff --git a/ememory/SharedPtr.h b/ememory/SharedPtr.h
index 962b3da..1fdc23e 100644
--- a/ememory/SharedPtr.h
+++ b/ememory/SharedPtr.h
@@ -33,6 +33,7 @@ namespace ememory {
 			                                 , int>::type = 0>
 			SharedPtr(EMEMORY_TYPE2* _element);
 		public:
+			SharedPtr(std::nullptr_t);
 			SharedPtr();
 			~SharedPtr();
 			SharedPtr(EMEMORY_TYPE* _obj, ememory::Counter* _counter);
@@ -58,9 +59,25 @@ namespace ememory {
 			bool operator!=(const SharedPtr<EMEMORY_TYPE>& _obj) const;
 			const EMEMORY_TYPE* get() const;
 			EMEMORY_TYPE* get();
+			template<class EMEMORY_TYPE2 = EMEMORY_TYPE,
+			         typename std::enable_if<    std::is_same<EMEMORY_TYPE2, EMEMORY_TYPE>::value
+			                                  && !std::is_same<EMEMORY_TYPE2, void>::value
+			                                 , int>::type = 0>
 			const EMEMORY_TYPE* operator->() const;
+			template<class EMEMORY_TYPE2 = EMEMORY_TYPE,
+			         typename std::enable_if<    std::is_same<EMEMORY_TYPE2, EMEMORY_TYPE>::value
+			                                  && !std::is_same<EMEMORY_TYPE2, void>::value
+			                                 , int>::type = 0>
 			EMEMORY_TYPE* operator->();
+			template<class EMEMORY_TYPE2 = EMEMORY_TYPE,
+			         typename std::enable_if<    std::is_same<EMEMORY_TYPE2, EMEMORY_TYPE>::value
+			                                  && !std::is_same<EMEMORY_TYPE2, void>::value
+			                                 , int>::type = 0>
 			const EMEMORY_TYPE& operator*() const;
+			template<class EMEMORY_TYPE2 = EMEMORY_TYPE,
+			         typename std::enable_if<    std::is_same<EMEMORY_TYPE2, EMEMORY_TYPE>::value
+			                                  && !std::is_same<EMEMORY_TYPE2, void>::value
+			                                 , int>::type = 0>
 			EMEMORY_TYPE& operator*();
 			void swap(SharedPtr<EMEMORY_TYPE>& _obj);
 			ememory::Counter* getCounter() const {
diff --git a/ememory/WeakPtr.h b/ememory/WeakPtr.h
index 1d2dc4c..51c6025 100644
--- a/ememory/WeakPtr.h
+++ b/ememory/WeakPtr.h
@@ -22,6 +22,7 @@ namespace ememory {
 			ememory::Counter* m_counter;
 		public:
 			WeakPtr();
+			WeakPtr(std::nullptr_t);
 		private:
 			WeakPtr(EMEMORY_TYPE* _element); // this is only for enable shared from this ...
 		public:
diff --git a/ememory/details/SharedPtr.hxx b/ememory/details/SharedPtr.hxx
index ae280f9..f47bec9 100644
--- a/ememory/details/SharedPtr.hxx
+++ b/ememory/details/SharedPtr.hxx
@@ -57,6 +57,13 @@ ememory::SharedPtr<EMEMORY_TYPE>::SharedPtr():
 	EMEMORY_VERBOSE("new shared");
 }
 
+template<typename EMEMORY_TYPE>
+ememory::SharedPtr<EMEMORY_TYPE>::SharedPtr(std::nullptr_t):
+  m_element(nullptr),
+  m_counter(nullptr) {
+	EMEMORY_VERBOSE("new shared");
+}
+
 template<typename EMEMORY_TYPE>
 ememory::SharedPtr<EMEMORY_TYPE>::SharedPtr(EMEMORY_TYPE* _obj, ememory::Counter* _counter):
   m_element(_obj),
@@ -228,21 +235,37 @@ EMEMORY_TYPE* ememory::SharedPtr<EMEMORY_TYPE>::get() {
 }
 
 template<typename EMEMORY_TYPE>
+template<class EMEMORY_TYPE2,
+         typename std::enable_if<    std::is_same<EMEMORY_TYPE2, EMEMORY_TYPE>::value
+                                  && !std::is_same<EMEMORY_TYPE2, void>::value
+                                 , int>::type>
 const EMEMORY_TYPE* ememory::SharedPtr<EMEMORY_TYPE>::operator->() const {
 	return m_element;
 }
 
 template<typename EMEMORY_TYPE>
+template<class EMEMORY_TYPE2,
+         typename std::enable_if<    std::is_same<EMEMORY_TYPE2, EMEMORY_TYPE>::value
+                                  && !std::is_same<EMEMORY_TYPE2, void>::value
+                                 , int>::type>
 EMEMORY_TYPE* ememory::SharedPtr<EMEMORY_TYPE>::operator->() {
 	return m_element;
 }
 
 template<typename EMEMORY_TYPE>
+template<class EMEMORY_TYPE2,
+         typename std::enable_if<    std::is_same<EMEMORY_TYPE2, EMEMORY_TYPE>::value
+                                  && !std::is_same<EMEMORY_TYPE2, void>::value
+                                 , int>::type>
 const EMEMORY_TYPE& ememory::SharedPtr<EMEMORY_TYPE>::operator*() const {
 	return *m_element;
 }
 
 template<typename EMEMORY_TYPE>
+template<class EMEMORY_TYPE2,
+         typename std::enable_if<    std::is_same<EMEMORY_TYPE2, EMEMORY_TYPE>::value
+                                  && !std::is_same<EMEMORY_TYPE2, void>::value
+                                 , int>::type>
 EMEMORY_TYPE& ememory::SharedPtr<EMEMORY_TYPE>::operator*() {
 	return *m_element;
 }
diff --git a/ememory/details/WeakPtr.hxx b/ememory/details/WeakPtr.hxx
index fab035b..1419249 100644
--- a/ememory/details/WeakPtr.hxx
+++ b/ememory/details/WeakPtr.hxx
@@ -17,6 +17,13 @@ ememory::WeakPtr<EMEMORY_TYPE>::WeakPtr():
 	
 }
 
+template<typename EMEMORY_TYPE>
+ememory::WeakPtr<EMEMORY_TYPE>::WeakPtr(std::nullptr_t):
+  m_element(nullptr),
+  m_counter(nullptr) {
+	
+}
+
 template<typename EMEMORY_TYPE>
 ememory::WeakPtr<EMEMORY_TYPE>::WeakPtr(EMEMORY_TYPE* _element):
   m_element(_element),
diff --git a/ememory/memory.h b/ememory/memory.h
index 8e4607f..7c822a7 100644
--- a/ememory/memory.h
+++ b/ememory/memory.h
@@ -24,7 +24,7 @@ namespace ememory {
 	}
 	template<class EMEMORY_TYPE_CAST, class EMEMORY_TYPE>
 	inline const ememory::SharedPtr<EMEMORY_TYPE_CAST> dynamicPointerCast(const ememory::SharedPtr<EMEMORY_TYPE>& _obj) {
-		return ememory::SharedPtr<EMEMORY_TYPE_CAST>(dynamic_cast<EMEMORY_TYPE_CAST*>(_obj.get()), _obj.getCounter());
+		return ememory::SharedPtr<EMEMORY_TYPE_CAST>(dynamic_cast<EMEMORY_TYPE_CAST*>(const_cast<EMEMORY_TYPE*>(_obj.get())), _obj.getCounter());
 	}
 	
 	template<class EMEMORY_TYPE_CAST, class EMEMORY_TYPE>
@@ -33,7 +33,7 @@ namespace ememory {
 	}
 	template<class EMEMORY_TYPE_CAST, class EMEMORY_TYPE>
 	inline const ememory::SharedPtr<EMEMORY_TYPE_CAST> staticPointerCast(const ememory::SharedPtr<EMEMORY_TYPE>& _obj) {
-		return ememory::SharedPtr<EMEMORY_TYPE_CAST>(static_cast<EMEMORY_TYPE_CAST*>(_obj.get()), _obj.getCounter());
+		return ememory::SharedPtr<EMEMORY_TYPE_CAST>(static_cast<EMEMORY_TYPE_CAST*>(const_cast<EMEMORY_TYPE*>(_obj.get())), _obj.getCounter());
 	}
 	
 	template<class EMEMORY_TYPE_CAST, class EMEMORY_TYPE>
@@ -42,6 +42,11 @@ namespace ememory {
 	}
 	template<class EMEMORY_TYPE_CAST, class EMEMORY_TYPE>
 	inline const ememory::SharedPtr<EMEMORY_TYPE_CAST> reinterpretPointerCast(const ememory::SharedPtr<EMEMORY_TYPE>& _obj) {
-		return ememory::SharedPtr<EMEMORY_TYPE_CAST>(reinterpret_cast<EMEMORY_TYPE_CAST*>(_obj.get()), _obj.getCounter());
+		return ememory::SharedPtr<EMEMORY_TYPE_CAST>(reinterpret_cast<EMEMORY_TYPE_CAST*>(const_cast<EMEMORY_TYPE*>(_obj.get())), _obj.getCounter());
+	}
+	
+	template<class EMEMORY_TYPE_CAST, class EMEMORY_TYPE>
+	inline ememory::SharedPtr<EMEMORY_TYPE_CAST> constPointerCast(const ememory::SharedPtr<EMEMORY_TYPE>& _obj) {
+		return ememory::SharedPtr<EMEMORY_TYPE_CAST>(const_cast<EMEMORY_TYPE*>(_obj.get()), _obj.getCounter());
 	}
 }