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

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

Author: romain
Date: 2010-05-20 21:06:26 +0200 (Thu, 20 May 2010)
New Revision: 1301

Added:
   pkg/Rcpp/inst/include/Rcpp/config.h
Modified:
   pkg/Rcpp/inst/include/Rcpp.h
   pkg/Rcpp/inst/include/Rcpp/Module.h
   pkg/Rcpp/inst/include/RcppCommon.h
   pkg/Rcpp/src/Module.cpp
   pkg/Rcpp/src/RcppCommon.cpp
Log:
s/RCPP_EXPERIMENTAL/RCPP_ENABLE_MODULES/

Modified: pkg/Rcpp/inst/include/Rcpp/Module.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Module.h	2010-05-20 18:37:14 UTC (rev 1300)
+++ pkg/Rcpp/inst/include/Rcpp/Module.h	2010-05-20 19:06:26 UTC (rev 1301)
@@ -22,7 +22,8 @@
 #ifndef Rcpp_Module_h
 #define Rcpp_Module_h
 
-#ifdef RCPP_EXPERIMENTAL
+#ifdef RCPP_ENABLE_MODULES
+
 namespace Rcpp{
 
 class CppFunction {

Added: pkg/Rcpp/inst/include/Rcpp/config.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/config.h	                        (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/config.h	2010-05-20 19:06:26 UTC (rev 1301)
@@ -0,0 +1,29 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 4 -*-
+//
+// config.h: Rcpp R/C++ interface class library -- Rcpp configuration of optional features
+//
+// Copyright (C) 2010 Dirk Eddelbuettel and Romain Francois
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef RCPP__CONFIG_H
+#define RCPP__CONFIG_H
+
+// uncomment to enable Rcpp modules
+// #define RCPP_ENABLE_MODULES
+
+#endif
+

Modified: pkg/Rcpp/inst/include/Rcpp.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp.h	2010-05-20 18:37:14 UTC (rev 1300)
+++ pkg/Rcpp/inst/include/Rcpp.h	2010-05-20 19:06:26 UTC (rev 1301)
@@ -69,8 +69,7 @@
 #include <Rcpp/Formula.h>
 #include <Rcpp/DataFrame.h>
 
-// #define RCPP_EXPERIMENTAL
-#ifdef RCPP_EXPERIMENTAL
+#ifdef RCPP_ENABLE_MODULES
 #include <Rcpp/Module.h>
 #endif
 

Modified: pkg/Rcpp/inst/include/RcppCommon.h
===================================================================
--- pkg/Rcpp/inst/include/RcppCommon.h	2010-05-20 18:37:14 UTC (rev 1300)
+++ pkg/Rcpp/inst/include/RcppCommon.h	2010-05-20 19:06:26 UTC (rev 1301)
@@ -24,6 +24,8 @@
 #ifndef RcppCommon_h
 #define RcppCommon_h
 
+#include <Rcpp/config.h>
+
 void logTxtFunction(const char* file, const int line, const char* expression ) ;
 
 /**

Modified: pkg/Rcpp/src/Module.cpp
===================================================================
--- pkg/Rcpp/src/Module.cpp	2010-05-20 18:37:14 UTC (rev 1300)
+++ pkg/Rcpp/src/Module.cpp	2010-05-20 19:06:26 UTC (rev 1301)
@@ -19,7 +19,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef RCPP_EXPERIMENTAL
+#ifdef RCPP_ENABLE_MODULES
 
 #include <Rcpp.h>
 

Modified: pkg/Rcpp/src/RcppCommon.cpp
===================================================================
--- pkg/Rcpp/src/RcppCommon.cpp	2010-05-20 18:37:14 UTC (rev 1300)
+++ pkg/Rcpp/src/RcppCommon.cpp	2010-05-20 19:06:26 UTC (rev 1301)
@@ -69,7 +69,7 @@
 	LOGICAL(cap)[4] = FALSE ;
 #endif
 
-#ifdef RCPP_EXPERIMENTAL
+#ifdef RCPP_ENABLE_MODULES
 	LOGICAL(cap)[5] = TRUE ;
 #else
 	LOGICAL(cap)[5] = FALSE ;