diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-11-30 21:34:43 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-11-30 21:34:43 -0500 |
| commit | cc2a768ff19e9fc83661a51d4cb4fef9b354ff30 (patch) | |
| tree | 36a29f6c442c9e1386d00348b3db93fd12ab4979 /include | |
| parent | 1024fe8305e5b0a7bb1f660a1cee077172d84534 (diff) | |
quest work
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } /** |