Fixed compiler error involving template resolution in is_same::invoke

UniStuttgart-VISUS · May 18, 2019 · b0a8358 · b0a8358
1 parent dde72a2
commit b0a8358
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/datraw/datraw/variant.inl b/datraw/datraw/variant.inl
@@ -20,8 +20,12 @@ void datraw::detail::copy_to<C, T>::invoke(const type& v,
 template<class C, datraw::variant_type T>
 void datraw::detail::is_same<C, T>::invoke(type& v, const variant_type& rhs,
         bool& retval) {
-    // Cf. https://stackoverflow.com/questions/3505713/c-template-compilation-error-expected-primary-expression-before-token
-    retval = (v == rhs.template get<T>());
+	typedef detail::variant_fwd_traits<C, T> traits;
+	assert(rhs.type() == T);
+	// Cf. https://stackoverflow.com/questions/3505713/c-template-compilation-error-expected-primary-expression-before-token
+    //retval = (v == rhs.template get<T>());
+	// New version of VS2017 cannot resolve the above any more ...
+	retval = (v == rhs.template get<traits::value_type>());
 }