[Rcpp-commits] r4575 - pkg/Rcpp/inst/include/Rcpp/api/meat

[noreply at r-forge.r-project.org]

Author: edd
Date: 2013-10-16 23:00:56 +0200 (Wed, 16 Oct 2013)
New Revision: 4575

Modified:
   pkg/Rcpp/inst/include/Rcpp/api/meat/is.h
Log:
fix a compile error due to non-ascii chars; minor whitespace edits too


Modified: pkg/Rcpp/inst/include/Rcpp/api/meat/is.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/api/meat/is.h	2013-10-16 09:57:44 UTC (rev 4574)
+++ pkg/Rcpp/inst/include/Rcpp/api/meat/is.h	2013-10-16 21:00:56 UTC (rev 4575)
@@ -30,23 +30,18 @@
         SEXP dim = Rf_getAttrib( x, R_DimSymbol) ;
         return dim != R_NilValue && Rf_length(dim) == 2 ;
     }
-    
     template <> inline bool is__simple<int>( SEXP x ){
         return is_atomic(x) && TYPEOF(x) == INTSXP ;
     }
-
     template <> inline bool is__simple<double>( SEXP x ){
         return is_atomic(x) && TYPEOF(x) == REALSXP ;
     }
-    
     template <> inline bool is__simple<bool>( SEXP x ){
         return is_atomic(x) && TYPEOF(x) == LGLSXP ;
     }
-    
     template <> inline bool is__simple<std::string>( SEXP x ){
         return is_atomic(x) && TYPEOF(x) == STRSXP ;
     }
-    
     template <> inline bool is__simple<String>( SEXP x ){
         return is_atomic(x) && TYPEOF(x) == STRSXP ;
     }
@@ -78,7 +73,7 @@
         return TYPEOF(x) == LANGSXP ;
     }
     template <> inline bool is__simple<DottedPair>( SEXP x ){
-        return TYPEOF(x) == LANGSXP || TYPEOF(x) == LISTSXP ;
+        return (TYPEOF(x) == LANGSXP) || (TYPEOF(x) == LISTSXP);
     }
     template <> inline bool is__simple<List>( SEXP x ){
         return TYPEOF(x) == VECSXP ;