[Rcpp-commits] r1566 - in pkg/Rcpp/inst/include: . Rcpp/sugar Rcpp/traits Rcpp/vector

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

Author: romain
Date: 2010-06-17 13:16:16 +0200 (Thu, 17 Jun 2010)
New Revision: 1566

Removed:
   pkg/Rcpp/inst/include/Rcpp/traits/get_iterator.h
Modified:
   pkg/Rcpp/inst/include/Rcpp/sugar/LogicalResult.h
   pkg/Rcpp/inst/include/Rcpp/vector/00_forward_Vector.h
   pkg/Rcpp/inst/include/Rcpp/vector/proxy.h
   pkg/Rcpp/inst/include/RcppCommon.h
Log:
remove get_iterator (cant get it to do what I want)

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/LogicalResult.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/LogicalResult.h	2010-06-17 11:13:47 UTC (rev 1565)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/LogicalResult.h	2010-06-17 11:16:16 UTC (rev 1566)
@@ -126,14 +126,6 @@
 
 } // namespace sugar
 
-namespace traits{
-	template <typename T>
-	struct get_iterator	< Rcpp::sugar::LogicalResult<T> >{
-		typedef typename Rcpp::sugar::LogicalResult<T>::iterator type ;
-	} ;
-	
-} // namespace traits
-
 }
 
 #endif

Deleted: pkg/Rcpp/inst/include/Rcpp/traits/get_iterator.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/traits/get_iterator.h	2010-06-17 11:13:47 UTC (rev 1565)
+++ pkg/Rcpp/inst/include/Rcpp/traits/get_iterator.h	2010-06-17 11:16:16 UTC (rev 1566)
@@ -1,36 +0,0 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
-//
-// get_iterator.h: Rcpp R/C++ interface class library -- 
-//
-// Copyright (C) 2010	Dirk Eddelbuettel and Romain Francois
-//
-// This file is part of Rcpp.
-//
-// Rcpp is free software: you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 2 of the License, or
-// (at your option) any later version.
-//
-// Rcpp is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef Rcpp__traits__get_iterator_h
-#define Rcpp__traits__get_iterator_h
-
-namespace Rcpp{
-namespace traits{
-
-	template <typename T>
-	struct get_iterator{
-		typedef typename T::iterator type ;
-	} ;
-	
-}  // traits
-}  // Rcpp
-
-#endif

Modified: pkg/Rcpp/inst/include/Rcpp/vector/00_forward_Vector.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/vector/00_forward_Vector.h	2010-06-17 11:13:47 UTC (rev 1565)
+++ pkg/Rcpp/inst/include/Rcpp/vector/00_forward_Vector.h	2010-06-17 11:16:16 UTC (rev 1566)
@@ -23,8 +23,5 @@
 #define Rcpp__vector__forward_Vector_h
 
 template <int RTYPE> class Vector ;
-namespace traits {
-	template <int RTYPE> struct get_iterator< Rcpp::Vector<RTYPE> > ; 
-}
 
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/vector/proxy.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/vector/proxy.h	2010-06-17 11:13:47 UTC (rev 1565)
+++ pkg/Rcpp/inst/include/Rcpp/vector/proxy.h	2010-06-17 11:16:16 UTC (rev 1566)
@@ -232,11 +232,6 @@
 	template<> struct r_vector_iterator<EXPRSXP> : proxy_based_iterator<EXPRSXP>{} ;
 	template<> struct r_vector_iterator<STRSXP> : proxy_based_iterator<STRSXP>{} ;
 
-	template <int RTYPE>
-	struct get_iterator< Rcpp::Vector<RTYPE> >{
-		typedef typename traits::r_vector_iterator<RTYPE>::type type ;
-	} ;
-	
 }  // traits
 
 

Modified: pkg/Rcpp/inst/include/RcppCommon.h
===================================================================
--- pkg/Rcpp/inst/include/RcppCommon.h	2010-06-17 11:13:47 UTC (rev 1565)
+++ pkg/Rcpp/inst/include/RcppCommon.h	2010-06-17 11:16:16 UTC (rev 1566)
@@ -226,7 +226,6 @@
 #include <Rcpp/traits/is_na.h>
 #include <Rcpp/traits/is_trivial.h>
 #include <Rcpp/traits/init_type.h>
-#include <Rcpp/traits/get_iterator.h>
 
 #include <Rcpp/traits/is_const.h>
 #include <Rcpp/traits/is_reference.h>
@@ -253,18 +252,6 @@
 #include <Rcpp/preprocessor.h>
 #include <Rcpp/algo.h>
 
-
-// namespace Rcpp{
-// namespace sugar{
-// template <typename T> class LogicalResult ;
-// }
-// 
-// namespace traits{
-// 	template <typename T>
-// 	struct get_iterator	< Rcpp::sugar::LogicalResult<T> > ;
-// }
-// }
-
 #include <Rcpp/vector/VectorBase.h>
 
 #include <Rcpp/sugar/sugar_forward.h>