From 6c5d9fffaa1fa7ab014b3f85251c015da509fbe3 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Fri, 1 Feb 2019 23:11:23 +0300
Subject: [PATCH] typemap: improve pointer support

If stored object is a pointer, access dereferenced object directly via ->
---
 Utilities/typemap.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/Utilities/typemap.h b/Utilities/typemap.h
index e7d36e730b..c8a9019e2f 100644
--- a/Utilities/typemap.h
+++ b/Utilities/typemap.h
@@ -128,6 +128,19 @@ namespace utils
 		static_assert(std::has_virtual_destructor_v<std::decay_t<T>>);
 	};
 
+	// Detect operator ->
+	template <typename T, typename = void>
+	struct typeinfo_pointer
+	{
+		static constexpr bool is_ptr = false;
+	};
+
+	template <typename T>
+	struct typeinfo_pointer<T, std::void_t<decltype(&std::decay_t<T>::operator->)>>
+	{
+		static constexpr bool is_ptr = true;
+	};
+
 	// Type information
 	struct typeinfo_base
 	{
@@ -469,7 +482,15 @@ namespace utils
 
 		auto operator->() const noexcept
 		{
-			return get();
+			// Invoke object's operator -> if available
+			if constexpr (typeinfo_pointer<T>::is_ptr)
+			{
+				return get()->operator->();
+			}
+			else
+			{
+				return get();
+			}
 		}
 
 		// Release the lock and set invalid state