[Rcpp-commits] r2531 - in pkg/Rcpp: inst/include inst/include/Rcpp src

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

Author: romain
Date: 2010-11-26 12:57:12 +0100 (Fri, 26 Nov 2010)
New Revision: 2531

Modified:
   pkg/Rcpp/inst/include/Rcpp.h
   pkg/Rcpp/inst/include/Rcpp/Module.h
   pkg/Rcpp/inst/include/Rcpp/config.h
   pkg/Rcpp/src/Module.cpp
   pkg/Rcpp/src/RcppCommon.cpp
Log:
remove the ENABLE_RCPP_MODULES macro since modules are stable now

Modified: pkg/Rcpp/inst/include/Rcpp/Module.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Module.h	2010-11-26 11:50:20 UTC (rev 2530)
+++ pkg/Rcpp/inst/include/Rcpp/Module.h	2010-11-26 11:57:12 UTC (rev 2531)
@@ -23,7 +23,6 @@
 #define Rcpp_Module_h
    
 #include <Rcpp/config.h>
-#ifdef RCPP_ENABLE_MODULES
 
 namespace Rcpp{
 
@@ -739,7 +738,5 @@
 
 #define LOAD_RCPP_MODULE(NAME) Rf_eval( Rf_lang2( Rf_install("Module"), _rcpp_module_boot_##NAME() ), R_GlobalEnv )
 
-#endif  
-
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/config.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/config.h	2010-11-26 11:50:20 UTC (rev 2530)
+++ pkg/Rcpp/inst/include/Rcpp/config.h	2010-11-26 11:57:12 UTC (rev 2531)
@@ -22,9 +22,6 @@
 #ifndef RCPP__CONFIG_H
 #define RCPP__CONFIG_H
 
-// comment to disable Rcpp modules
-#define RCPP_ENABLE_MODULES
-
 #ifdef __GNUC__
 #define RCPP_HAS_DEMANGLING
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp.h	2010-11-26 11:50:20 UTC (rev 2530)
+++ pkg/Rcpp/inst/include/Rcpp.h	2010-11-26 11:57:12 UTC (rev 2531)
@@ -63,10 +63,7 @@
 #include <Rcpp/Datetime.h>
 #include <Rcpp/DatetimeVector.h>
 
-#ifdef RCPP_ENABLE_MODULES
 #include <Rcpp/Module.h>
-#endif
-
 #include <Rcpp/InternalFunction.h>
 
 #include <Rmath.h>

Modified: pkg/Rcpp/src/Module.cpp
===================================================================
--- pkg/Rcpp/src/Module.cpp	2010-11-26 11:50:20 UTC (rev 2530)
+++ pkg/Rcpp/src/Module.cpp	2010-11-26 11:57:12 UTC (rev 2531)
@@ -21,8 +21,6 @@
 
 #include <Rcpp.h>
 
-#ifdef RCPP_ENABLE_MODULES
-
 #define MAX_ARGS 65
 
 typedef Rcpp::XPtr<Rcpp::Module> XP_Module ; 
@@ -394,9 +392,3 @@
 	
 }
 
-
-#else
-/* quiet ranlib */ 
-void dummy(){}
-#endif
-

Modified: pkg/Rcpp/src/RcppCommon.cpp
===================================================================
--- pkg/Rcpp/src/RcppCommon.cpp	2010-11-26 11:50:20 UTC (rev 2530)
+++ pkg/Rcpp/src/RcppCommon.cpp	2010-11-26 11:57:12 UTC (rev 2531)
@@ -70,11 +70,7 @@
 	LOGICAL(cap)[4] = FALSE ;
 #endif
 
-#ifdef RCPP_ENABLE_MODULES
 	LOGICAL(cap)[5] = TRUE ;
-#else
-	LOGICAL(cap)[5] = FALSE ;
-#endif
 
 #ifdef RCPP_HAS_DEMANGLING
 	LOGICAL(cap)[6] = TRUE ;