comment-out / reverse yesterday's commit 94fc145

a function print() in global namespace too likely to clash with other definitions

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,9 @@
+2015-03-02  Dirk Eddelbuettel  <[email protected]>
+
+        * src/api.cpp: Commented-out print() in global namespace
+        * src/Rcpp_init.cpp: Commented-out registration of print()
+        * inst/include/Rcpp/routines.h: Commented-out initialization
+
 2015-03-01  Dirk Eddelbuettel  <[email protected]>
 
         * src/api.cpp: New function print() as a wrapper around Rf_PrintValue()

inst/include/Rcpp/routines.h

@@ -59,7 +59,7 @@ void          setCurrentScope( Rcpp::Module* mod );
 SEXP          reset_current_error();
 int           error_occured();
 SEXP          rcpp_get_current_error();
-void          print(SEXP s);
+// void          print(SEXP s);
 
 #else
 
@@ -245,11 +245,11 @@ inline attribute_hidden SEXP rcpp_get_current_error(){
     return fun();
 }
 
-inline attribute_hidden void print(SEXP s) {
-    typedef void (*Fun)(SEXP);
-    static Fun fun = GET_CALLABLE("print");
-    fun(s);
-}
+// inline attribute_hidden void print(SEXP s) {
+//     typedef void (*Fun)(SEXP);
+//     static Fun fun = GET_CALLABLE("print");
+//     fun(s);
+// }
 
 #endif
 

src/Rcpp_init.cpp

@@ -116,7 +116,7 @@ void registerFunctions(){
     RCPP_REGISTER(reset_current_error)
     RCPP_REGISTER(error_occured)
     RCPP_REGISTER(rcpp_get_current_error)
-    RCPP_REGISTER(print)
+    //RCPP_REGISTER(print)
     #undef RCPP_REGISTER
 }
 

src/api.cpp

@@ -298,10 +298,10 @@ SEXP stack_trace( const char* file, int line ){
     #endif
 }
 
-// [[Rcpp::register]]
-void print(SEXP s) {
-    Rf_PrintValue(s);           // defined in Rinternals.h
-}
+// // [ [ Rcpp::register ] ]
+// void print(SEXP s) {
+//     Rf_PrintValue(s);           // defined in Rinternals.h
+// }
 
 // }}}