From: slipher <slipher@protonmail.com>
Date: Sun, 5 Apr 2020 03:09:07 +0000 (+0200)
Subject: clang/error: fix: call to convertToOpaque is ambiguous
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d475438d5252a877a07ed533fc257fba930558a;p=xonotic%2Fnetradiant.git

clang/error: fix: call to convertToOpaque is ambiguous
---

diff --git a/libs/generic/callback.h b/libs/generic/callback.h
index 577dd9d9..7479826c 100644
--- a/libs/generic/callback.h
+++ b/libs/generic/callback.h
@@ -101,7 +101,7 @@ namespace detail {
 
 	// pointer
 
-	template<class T>
+	template<class T, class U = typename std::enable_if<!std::is_function<T>::value>::type>
 	inline const void *convertToOpaque(const T *t) {
 		return t;
 	}
@@ -113,7 +113,7 @@ namespace detail {
 		}
 	};
 
-	template<class T>
+	template<class T, class U = typename std::enable_if<!std::is_function<T>::value>::type>
 	inline void *convertToOpaque(T *t) {
 		return t;
 	}