[Rcpp-commits] r432 - in pkg: inst src

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

Author: romain
Date: 2010-01-23 10:09:20 +0100 (Sat, 23 Jan 2010)
New Revision: 432

Modified:
   pkg/inst/ChangeLog
   pkg/src/wrap.cpp
Log:


Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-01-22 17:16:13 UTC (rev 431)
+++ pkg/inst/ChangeLog	2010-01-23 09:09:20 UTC (rev 432)
@@ -1,3 +1,7 @@
+2010-01-23  Romain Francois <francoisromain at free.fr>
+
+	* src/wrap.cpp: s/copy/std::copy/
+
 2010-01-22  Romain Francois <francoisromain at free.fr>
 
 	* src/Makevars.win: disable c++0x entirely (for now)

Modified: pkg/src/wrap.cpp
===================================================================
--- pkg/src/wrap.cpp	2010-01-22 17:16:13 UTC (rev 431)
+++ pkg/src/wrap.cpp	2010-01-23 09:09:20 UTC (rev 432)
@@ -115,7 +115,7 @@
     logTxt("RObject from bool vector\n");
     size_t n = v.size();
     SEXP m_sexp = PROTECT( Rf_allocVector(LGLSXP, n) );
-    copy( v.begin(), v.end(), LOGICAL(m_sexp) ) ;
+    std::copy( v.begin(), v.end(), LOGICAL(m_sexp) ) ;
     LogicalVector o(m_sexp) ;
     UNPROTECT(1) ; /* m_sexp now preserved by o */
     return o ;
@@ -125,7 +125,7 @@
     logTxt("RObject from int vector\n");
     size_t n = v.size();
     SEXP m_sexp = PROTECT( Rf_allocVector(INTSXP, n) );
-    copy( v.begin(), v.end(), INTEGER(m_sexp) ) ;
+    std::copy( v.begin(), v.end(), INTEGER(m_sexp) ) ;
     IntegerVector o(m_sexp) ;
     UNPROTECT(1) ;
     return o ;
@@ -135,7 +135,7 @@
     logTxt("RObject from double vector\n");
     size_t n = v.size();
     SEXP m_sexp = PROTECT( Rf_allocVector(REALSXP, n) );
-    copy( v.begin(), v.end(), REAL(m_sexp) ) ;
+    std::copy( v.begin(), v.end(), REAL(m_sexp) ) ;
     NumericVector o(m_sexp) ;
     UNPROTECT(1) ;
     return o ;
@@ -145,7 +145,7 @@
     logTxt("RObject from vector<Rbyte> \n");
     size_t n = v.size();
     SEXP m_sexp = PROTECT(Rf_allocVector(RAWSXP, n));
-    copy( v.begin(), v.end(), RAW(m_sexp) ) ;
+    std::copy( v.begin(), v.end(), RAW(m_sexp) ) ;
     RawVector o(m_sexp) ;
     UNPROTECT(1) ;
     return o ;