[Rcpp-commits] r3459 - in pkg/Rcpp: . inst/include/Rcpp

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

Author: romain
Date: 2012-02-03 11:00:44 +0100 (Fri, 03 Feb 2012)
New Revision: 3459

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/Extractor.h
Log:
remove use of Fast in Extractor

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-02-03 03:17:07 UTC (rev 3458)
+++ pkg/Rcpp/ChangeLog	2012-02-03 10:00:44 UTC (rev 3459)
@@ -1,3 +1,7 @@
+2012-02-03  Romain Francois  <romain at r-enthusiasts.com>
+
+        * inst/include/Rcpp/Extractor.h: rmove use of Fast in Extractor
+
 2012-02-01  Romain Francois  <romain at r-enthusiasts.com>
 
         * inst/include/Rcpp/iostream/Rostream.h: no need to include Rcpp.h

Modified: pkg/Rcpp/inst/include/Rcpp/Extractor.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Extractor.h	2012-02-03 03:17:07 UTC (rev 3458)
+++ pkg/Rcpp/inst/include/Rcpp/Extractor.h	2012-02-03 10:00:44 UTC (rev 3459)
@@ -2,7 +2,7 @@
 //
 // Extractor.h: Rcpp R/C++ interface class library -- faster vectors (less interface)
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -29,36 +29,7 @@
     struct Extractor {
         typedef VECTOR type ;  
     } ;  
-
-    // apparently Rcpp::Fast upsets windows, so we stick with 
-    // the identity class above, meaning no fast indexing
-    // update 30 Oct 2010: that may have been g++ 4.5 rather than Windows
-    //                     so rephrasing text in terms of macro from RcppCommon.h
-//#ifndef WIN32
-#ifdef __GNUC__
-#ifndef IS_GCC_450_OR_LATER
-    template <> 
-    struct Extractor<INTSXP, true, Rcpp::Vector<INTSXP> >{
-        typedef Rcpp::Fast< Rcpp::Vector<INTSXP> > type ;
-    } ;
-    
-    template <> 
-    struct Extractor<REALSXP, true, Rcpp::Vector<REALSXP> >{
-        typedef Rcpp::Fast< Rcpp::Vector<REALSXP> > type ;
-    } ;
-    
-    template <> 
-    struct Extractor<LGLSXP, true, Rcpp::Vector<LGLSXP> >{
-        typedef Rcpp::Fast< Rcpp::Vector<LGLSXP> > type ;
-    } ;
-    
-    template <> 
-    struct Extractor<RAWSXP, true, Rcpp::Vector<RAWSXP> >{
-        typedef Rcpp::Fast< Rcpp::Vector<RAWSXP> > type ;
-    } ;
-#endif    
-#endif
-
+   
 } // traits
 } // Rcpp