From cc2a768ff19e9fc83661a51d4cb4fef9b354ff30 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 30 Nov 2016 21:34:43 -0500
Subject: quest work

---
 include/common.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/common.hpp b/include/common.hpp
index 249b9eb..7b98ea9 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -59,9 +59,9 @@ typedef unsigned int uint;
 #define BREAKPOINT __asm__("int $3")
 
 template<typename T>
-inline const T * const& coalesce(const T * const &p1, const T * const &p2)
+inline const T * const& coalesce(const void * &p1, const void * &p2)
 {
-	return ((p1 == nullptr) ? p2 : p1);
+	return ((p1 == nullptr) ? reinterpret_cast<T*>(p2) : p1);
 }
 
 /**
-- 
cgit v1.2.3