Work around false ambiguity bug in GCC

daedric · jfirebaugh · commit 69a84f738b28 · 2017-05-08T13:32:38.000-07:00
diff --git a/include/jni/class.hpp b/include/jni/class.hpp
@@ -90,7 +90,7 @@ namespace jni
 
             template < class R, class... Args >
             auto Call(JNIEnv& env, const StaticMethod<TagType, R (Args...)>& method, const Args&... args) const
-               -> std::enable_if_t< !IsPrimitive<R>::value, R >
+               -> std::enable_if_t< !IsPrimitive<R>::value && !std::is_void<R>::value, R >
                {
                 return R(reinterpret_cast<UntaggedType<R>>(CallStaticMethod<jobject*>(env, *clazz, method, Untag(args)...)));
                }
diff --git a/include/jni/object.hpp b/include/jni/object.hpp
@@ -106,7 +106,7 @@ namespace jni
 
             template < class R, class... Args >
             auto Call(JNIEnv& env, const Method<TagType, R (Args...)>& method, const Args&... args) const
-               -> std::enable_if_t< !IsPrimitive<R>::value, R >
+               -> std::enable_if_t< !IsPrimitive<R>::value && !std::is_void<R>::value, R >
                {
                 return R(reinterpret_cast<UntaggedType<R>>(CallMethod<jobject*>(env, obj, method, Untag(args)...)));
                }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ namespace jni`
`90`	`90`
`91`	`91`	`template < class R, class... Args >`
`92`	`92`	`auto Call(JNIEnv& env, const StaticMethod<TagType, R (Args...)>& method, const Args&... args) const`
`93`		`- -> std::enable_if_t< !IsPrimitive<R>::value, R >`
	`93`	`+ -> std::enable_if_t< !IsPrimitive<R>::value && !std::is_void<R>::value, R >`
`94`	`94`	`{`
`95`	`95`	`return R(reinterpret_cast<UntaggedType<R>>(CallStaticMethod<jobject>(env, clazz, method, Untag(args)...)));`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ namespace jni`
`106`	`106`
`107`	`107`	`template < class R, class... Args >`
`108`	`108`	`auto Call(JNIEnv& env, const Method<TagType, R (Args...)>& method, const Args&... args) const`
`109`		`- -> std::enable_if_t< !IsPrimitive<R>::value, R >`
	`109`	`+ -> std::enable_if_t< !IsPrimitive<R>::value && !std::is_void<R>::value, R >`
`110`	`110`	`{`
`111`	`111`	`return R(reinterpret_cast<UntaggedType<R>>(CallMethod<jobject*>(env, obj, method, Untag(args)...)));`
`112`	`112`	`}`