[Rcpp-commits] r3939 - in pkg/Rcpp: . src

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

Author: jjallaire
Date: 2012-11-11 21:25:57 +0100 (Sun, 11 Nov 2012)
New Revision: 3939

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/src/Attributes.cpp
Log:
fully qualify _ in generated code

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-11-11 18:05:47 UTC (rev 3938)
+++ pkg/Rcpp/ChangeLog	2012-11-11 20:25:57 UTC (rev 3939)
@@ -1,3 +1,7 @@
+2012-11-11  JJ Allaire <jj at rstudio.org>
+
+        * src/Attributes.cpp: fully qualify _ in generated code
+
 2012-11-11  Romain Francois <romain at r-enthusiasts.com>
 
         * include/Rcpp/iostream/Rstreambuf.h: implementing sync() so that

Modified: pkg/Rcpp/src/Attributes.cpp
===================================================================
--- pkg/Rcpp/src/Attributes.cpp	2012-11-11 18:05:47 UTC (rev 3938)
+++ pkg/Rcpp/src/Attributes.cpp	2012-11-11 20:25:57 UTC (rev 3939)
@@ -134,7 +134,7 @@
                                         it->function().arguments();
                     ostr << ", Rcpp::List::create("; 
                     for (size_t i=0; i<args.size(); i++) {
-                        ostr << "_[\"" << args[i].name() << "\"]";
+                        ostr << "Rcpp::_[\"" << args[i].name() << "\"]";
                         if (i != (args.size()-1))
                             ostr << ", ";
                     }