[Rcpp-commits] r3033 - pkg/RcppArmadillo/inst/include/RcppArmadillo

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

Author: edd
Date: 2011-05-25 03:32:52 +0200 (Wed, 25 May 2011)
New Revision: 3033

Modified:
   pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h
Log:
now with complete and seemingly correct switch from templated check 'isnt_same_type' to new 'arma_type_check< is_same_type<...> >'


Modified: pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h	2011-05-25 01:12:58 UTC (rev 3032)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h	2011-05-25 01:32:52 UTC (rev 3033)
@@ -2,7 +2,7 @@
 //
 // Mat_meat.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010 - 2011  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //
@@ -37,8 +37,8 @@
 	
 	// TODO : deal with complex expressions because 
 	// std::complex<double> != Rcomplex
-	is_same_type<eT, typename Rcpp::traits::storage_type<RTYPE>::type >::check();
-  	
+	arma_type_check< is_same_type< eT, typename Rcpp::traits::storage_type<RTYPE>::type >::value == false >::apply();
+
 	set_size(X.size(), 1);
 	
 	eT* ptr = memptr() ;
@@ -62,7 +62,7 @@
 	
 	// TODO : deal with complex expressions because 
 	// std::complex<double> != Rcomplex
-	is_same_type<eT, typename Rcpp::traits::storage_type<RTYPE>::type >::check();
+	arma_type_check< is_same_type< eT, typename Rcpp::traits::storage_type<RTYPE>::type >::value == false >::apply();
   	
 	u32 nr = X.nrow(), nc = X.ncol(), i_col, i_row, k ;
 	set_size( nr, nc ) ;