[Rcpp-commits] r1647 - pkg/Rcpp/inst/include/Rcpp/sugar/logical

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

Author: romain
Date: 2010-06-21 14:59:45 +0200 (Mon, 21 Jun 2010)
New Revision: 1647

Modified:
   pkg/Rcpp/inst/include/Rcpp/sugar/logical/logical.h
   pkg/Rcpp/inst/include/Rcpp/sugar/logical/or.h
Log:
 (SingleLogicalResult) || bool

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/logical/logical.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/logical/logical.h	2010-06-21 12:57:18 UTC (rev 1646)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/logical/logical.h	2010-06-21 12:59:45 UTC (rev 1647)
@@ -22,6 +22,8 @@
 #ifndef RCPP_SUGAR_LOGICAL_H
 #define RCPP_SUGAR_LOGICAL_H
 
+#include <Rcpp/sugar/logical/can_have_na.h>
+
 #include <Rcpp/sugar/logical/SingleLogicalResult.h>
 #include <Rcpp/sugar/logical/not.h>
 #include <Rcpp/sugar/logical/and.h>

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/logical/or.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/logical/or.h	2010-06-21 12:57:18 UTC (rev 1646)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/logical/or.h	2010-06-21 12:59:45 UTC (rev 1647)
@@ -177,10 +177,10 @@
 	typedef SingleLogicalResult<LHS_NA,LHS_T> LHS_TYPE ;
 	typedef SingleLogicalResult< 
 		LHS_NA , 
-		And_SingleLogicalResult_bool<LHS_NA,LHS_T>
+		Or_SingleLogicalResult_bool<LHS_NA,LHS_T>
 	> BASE ;
-	
-	And_SingleLogicalResult_bool( const LHS_TYPE& lhs_, bool rhs_) :
+	              
+	Or_SingleLogicalResult_bool( const LHS_TYPE& lhs_, bool rhs_) :
 		lhs(lhs_), rhs(rhs_){} ;
 	
 	inline void apply(){