work around RCPP_NO_SUGAR

romainfrancois · romainfrancois · commit 3c4ef8e4c1bd · 2014-02-24T13:00:44.000+01:00
diff --git a/inst/include/Rcpp/platform/solaris.h b/inst/include/Rcpp/platform/solaris.h
@@ -12,11 +12,13 @@ namespace traits{
   template <typename T> struct is_convertible< std::vector<T>, SEXP> : public false_type{} ;
   template <> struct is_convertible<Range,SEXP> : public false_type{} ;
   
+  #if !defined(RCPP_NO_SUGAR)
   template <int RTYPE, bool NA>
   struct is_convertible< sugar::Minus_Vector_Primitive< RTYPE, NA, Vector<RTYPE> >, SEXP> : public false_type{} ;
   
   template <int RTYPE, bool NA>
   struct is_convertible< sugar::Plus_Vector_Primitive< RTYPE, NA, Vector<RTYPE> >, SEXP> : public false_type{} ;
+  #endif
   
 }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,13 @@ namespace traits{`
`12`	`12`	`template <typename T> struct is_convertible< std::vector<T>, SEXP> : public false_type{} ;`
`13`	`13`	`template <> struct is_convertible<Range,SEXP> : public false_type{} ;`
`14`	`14`
	`15`	`+ #if !defined(RCPP_NO_SUGAR)`
`15`	`16`	`template <int RTYPE, bool NA>`
`16`	`17`	`struct is_convertible< sugar::Minus_Vector_Primitive< RTYPE, NA, Vector<RTYPE> >, SEXP> : public false_type{} ;`
`17`	`18`
`18`	`19`	`template <int RTYPE, bool NA>`
`19`	`20`	`struct is_convertible< sugar::Plus_Vector_Primitive< RTYPE, NA, Vector<RTYPE> >, SEXP> : public false_type{} ;`
	`21`	`+ #endif`
`20`	`22`
`21`	`23`	`}`
`22`	`24`	`}`