Skip to content

Commit bcdf6b5

Browse files
more generic sfinae noise protection on solaris
1 parent 321ced0 commit bcdf6b5

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

inst/include/Rcpp/platform/solaris.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ namespace traits{
1717
template <> struct is_convertible<Range,SEXP> : public false_type{} ;
1818

1919
#if !defined(RCPP_NO_SUGAR)
20-
template <int RTYPE, bool NA>
21-
struct is_convertible< sugar::Minus_Vector_Primitive< RTYPE, NA, Vector<RTYPE> >, SEXP> : public false_type{} ;
20+
template <int RTYPE, bool NA, typename T>
21+
struct is_convertible< sugar::Minus_Vector_Primitive< RTYPE, NA, T >, SEXP> : public false_type{} ;
22+
23+
template <int RTYPE, bool NA, typename T>
24+
struct is_convertible< sugar::Plus_Vector_Primitive< RTYPE, NA, T >, SEXP> : public false_type{} ;
25+
26+
template <int RTYPE, bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T >
27+
struct is_convertible< sugar::Plus_Vector_Vector< RTYPE, LHS_NA, LHS_T, RHS_NA, RHS_T >, SEXP> : public false_type{} ;
2228

23-
template <int RTYPE, bool NA>
24-
struct is_convertible< sugar::Plus_Vector_Primitive< RTYPE, NA, Vector<RTYPE> >, SEXP> : public false_type{} ;
2529
#endif
2630

2731
}

0 commit comments

Comments
 (0)