[Rcpp-commits] r425 - in pkg: inst src src/Rcpp
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Jan 22 15:43:35 CET 2010
Author: romain
Date: 2010-01-22 15:43:35 +0100 (Fri, 22 Jan 2010)
New Revision: 425
Modified:
pkg/inst/ChangeLog
pkg/src/CharacterVector.cpp
pkg/src/ComplexVector.cpp
pkg/src/Environment.cpp
pkg/src/Evaluator.cpp
pkg/src/ExpressionVector.cpp
pkg/src/Function.cpp
pkg/src/GenericVector.cpp
pkg/src/IntegerVector.cpp
pkg/src/Language.cpp
pkg/src/LogicalVector.cpp
pkg/src/NumericVector.cpp
pkg/src/Pairlist.cpp
pkg/src/Promise.cpp
pkg/src/RawVector.cpp
pkg/src/Rcpp/Environment.h
pkg/src/Rcpp/Evaluator.h
pkg/src/Rcpp/ExpressionVector.h
pkg/src/Rcpp/Function.h
pkg/src/Rcpp/GenericVector.h
pkg/src/Rcpp/Language.h
pkg/src/Rcpp/Pairlist.h
pkg/src/Rcpp/wrap.h
pkg/src/exceptions.cpp
pkg/src/grow.cpp
Log:
clean the #include
Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/inst/ChangeLog 2010-01-22 14:43:35 UTC (rev 425)
@@ -4,9 +4,13 @@
* src/Rcpp/Environment.h: make sure what() is const. (suncc finding)
- * src/RcppCommon.h: pre declare classes, as an ettempt to
+ * src/RcppCommon.h: pre declare classes, as an attempt to
deal with the suncc warning "RObject may not have a type qualifier."
+ * src/Rcpp/*.h: make sure RcppCommon.h is the first included header
+
+ * src/*cpp: make sure foo.cpp only include Rcpp/foo.h
+
2010-01-21 Dirk Eddelbuettel <edd at debian.org>
* DESCRIPTION: Release 0.7.3
Modified: pkg/src/CharacterVector.cpp
===================================================================
--- pkg/src/CharacterVector.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/CharacterVector.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,10 +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/>.
-#include <RcppCommon.h>
-#include <Rcpp/RObject.h>
#include <Rcpp/CharacterVector.h>
-#include <algorithm>
namespace Rcpp{
Modified: pkg/src/ComplexVector.cpp
===================================================================
--- pkg/src/ComplexVector.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/ComplexVector.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,10 +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/>.
-#include <RcppCommon.h>
-#include <Rcpp/RObject.h>
#include <Rcpp/ComplexVector.h>
-#include <algorithm>
namespace Rcpp{
Modified: pkg/src/Environment.cpp
===================================================================
--- pkg/src/Environment.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Environment.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -20,10 +20,6 @@
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
#include <Rcpp/Environment.h>
-#include <Rcpp/Evaluator.h>
-#include <Rcpp/Symbol.h>
-#include <Rcpp/Language.h>
-#include <Rcpp/wrap.h>
namespace Rcpp {
Modified: pkg/src/Evaluator.cpp
===================================================================
--- pkg/src/Evaluator.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Evaluator.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -20,7 +20,6 @@
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
#include <Rcpp/Evaluator.h>
-#include <Rcpp/Environment.h>
namespace Rcpp {
Modified: pkg/src/ExpressionVector.cpp
===================================================================
--- pkg/src/ExpressionVector.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/ExpressionVector.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,12 +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/>.
-#include <RcppCommon.h>
-#include <Rcpp/RObject.h>
#include <Rcpp/ExpressionVector.h>
-#include <Rcpp/Evaluator.h>
-#include <Rcpp/Symbol.h>
-#include <algorithm>
namespace Rcpp{
Modified: pkg/src/Function.cpp
===================================================================
--- pkg/src/Function.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Function.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -20,11 +20,6 @@
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
#include <Rcpp/Function.h>
-#include <Rcpp/RObject.h>
-#include <Rcpp/Language.h>
-#include <Rcpp/Pairlist.h>
-#include <RcppCommon.h>
-#include <Rcpp/as.h>
namespace Rcpp {
Modified: pkg/src/GenericVector.cpp
===================================================================
--- pkg/src/GenericVector.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/GenericVector.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,12 +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/>.
-#include <RcppCommon.h>
-#include <Rcpp/RObject.h>
#include <Rcpp/GenericVector.h>
-#include <Rcpp/Evaluator.h>
-#include <Rcpp/Symbol.h>
-#include <algorithm>
namespace Rcpp{
Modified: pkg/src/IntegerVector.cpp
===================================================================
--- pkg/src/IntegerVector.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/IntegerVector.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,8 +19,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <RcppCommon.h>
-#include <Rcpp/RObject.h>
#include <Rcpp/IntegerVector.h>
namespace Rcpp{
Modified: pkg/src/Language.cpp
===================================================================
--- pkg/src/Language.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Language.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -20,8 +20,6 @@
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
#include <Rcpp/Language.h>
-#include <RcppCommon.h>
-#include <Rcpp/wrap.h>
namespace Rcpp {
Modified: pkg/src/LogicalVector.cpp
===================================================================
--- pkg/src/LogicalVector.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/LogicalVector.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,10 +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/>.
-#include <RcppCommon.h>
-#include <Rcpp/RObject.h>
#include <Rcpp/LogicalVector.h>
-#include <algorithm>
namespace Rcpp{
Modified: pkg/src/NumericVector.cpp
===================================================================
--- pkg/src/NumericVector.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/NumericVector.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,8 +19,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <RcppCommon.h>
-#include <Rcpp/RObject.h>
#include <Rcpp/NumericVector.h>
namespace Rcpp{
Modified: pkg/src/Pairlist.cpp
===================================================================
--- pkg/src/Pairlist.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Pairlist.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -20,10 +20,6 @@
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
#include <Rcpp/Pairlist.h>
-#include <Rcpp/Evaluator.h>
-#include <Rcpp/RObject.h>
-#include <Rcpp/Language.h>
-#include <RcppCommon.h>
namespace Rcpp {
Modified: pkg/src/Promise.cpp
===================================================================
--- pkg/src/Promise.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Promise.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -20,10 +20,6 @@
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
#include <Rcpp/Promise.h>
-#include <Rcpp/wrap.h>
-#include <Rcpp/RObject.h>
-#include <Rcpp/Environment.h>
-#include <Rcpp/ExpressionVector.h>
namespace Rcpp {
Modified: pkg/src/RawVector.cpp
===================================================================
--- pkg/src/RawVector.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/RawVector.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,10 +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/>.
-#include <RcppCommon.h>
-#include <Rcpp/RObject.h>
#include <Rcpp/RawVector.h>
-#include <algorithm>
namespace Rcpp{
Modified: pkg/src/Rcpp/Environment.h
===================================================================
--- pkg/src/Rcpp/Environment.h 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Rcpp/Environment.h 2010-01-22 14:43:35 UTC (rev 425)
@@ -24,6 +24,10 @@
#include <RcppCommon.h>
#include <Rcpp/RObject.h>
+#include <Rcpp/Evaluator.h>
+#include <Rcpp/wrap.h>
+#include <Rcpp/Symbol.h>
+#include <Rcpp/Language.h>
namespace Rcpp{
Modified: pkg/src/Rcpp/Evaluator.h
===================================================================
--- pkg/src/Rcpp/Evaluator.h 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Rcpp/Evaluator.h 2010-01-22 14:43:35 UTC (rev 425)
@@ -25,6 +25,7 @@
#include <RcppCommon.h>
#include <Rcpp/RObject.h>
#include <Rcpp/wrap.h>
+#include <Rcpp/Environment.h>
namespace Rcpp{
Modified: pkg/src/Rcpp/ExpressionVector.h
===================================================================
--- pkg/src/Rcpp/ExpressionVector.h 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Rcpp/ExpressionVector.h 2010-01-22 14:43:35 UTC (rev 425)
@@ -26,6 +26,7 @@
#include <Rcpp/RObject.h>
#include <Rcpp/VectorBase.h>
#include <Rcpp/Evaluator.h>
+#include <Rcpp/Environment.h>
#ifdef HAS_INIT_LISTS
#include <initializer_list>
Modified: pkg/src/Rcpp/Function.h
===================================================================
--- pkg/src/Rcpp/Function.h 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Rcpp/Function.h 2010-01-22 14:43:35 UTC (rev 425)
@@ -26,6 +26,9 @@
#include <Rcpp/RObject.h>
#include <Rcpp/Pairlist.h>
#include <Rcpp/Evaluator.h>
+#include <Rcpp/Language.h>
+#include <Rcpp/as.h>
+#include <Rcpp/Environment.h>
namespace Rcpp{
Modified: pkg/src/Rcpp/GenericVector.h
===================================================================
--- pkg/src/Rcpp/GenericVector.h 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Rcpp/GenericVector.h 2010-01-22 14:43:35 UTC (rev 425)
@@ -23,13 +23,15 @@
#define Rcpp_GenericVector_h
#include <RcppCommon.h>
+#include <Rcpp/wrap.h>
+#include <Rcpp/Environment.h>
#include <Rcpp/RObject.h>
-#include <Rcpp/Environment.h>
#include <Rcpp/VectorBase.h>
+#include <Rcpp/Evaluator.h>
+#include <Rcpp/Symbol.h>
#ifdef HAS_INIT_LISTS
#include <initializer_list>
-#include <algorithm>
#endif
namespace Rcpp{
Modified: pkg/src/Rcpp/Language.h
===================================================================
--- pkg/src/Rcpp/Language.h 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Rcpp/Language.h 2010-01-22 14:43:35 UTC (rev 425)
@@ -26,6 +26,7 @@
#include <Rcpp/RObject.h>
#include <Rcpp/Symbol.h>
#include <Rcpp/Pairlist.h>
+#include <Rcpp/wrap.h>
namespace Rcpp{
Modified: pkg/src/Rcpp/Pairlist.h
===================================================================
--- pkg/src/Rcpp/Pairlist.h 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Rcpp/Pairlist.h 2010-01-22 14:43:35 UTC (rev 425)
@@ -25,6 +25,7 @@
#include <RcppCommon.h>
#include <Rcpp/RObject.h>
#include <Rcpp/Named.h>
+#include <Rcpp/Evaluator.h>
namespace Rcpp{
Modified: pkg/src/Rcpp/wrap.h
===================================================================
--- pkg/src/Rcpp/wrap.h 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/Rcpp/wrap.h 2010-01-22 14:43:35 UTC (rev 425)
@@ -34,7 +34,6 @@
#include <Rcpp/RawVector.h>
#include <Rcpp/NumericVector.h>
#include <Rcpp/LogicalVector.h>
-#include <Rcpp/GenericVector.h>
#include <Rcpp/CharacterVector.h>
namespace Rcpp{
Modified: pkg/src/exceptions.cpp
===================================================================
--- pkg/src/exceptions.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/exceptions.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -19,14 +19,13 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <Rcpp.h>
+#include <RcppCommon.h>
/* for now, the fancy exception handling is only available in GCC,
simply because we've not investigated if it is available in other
compilers */
#ifdef __GNUC__
#include <typeinfo>
-#include <exception>
#include <exception_defines.h>
#include <cxxabi.h>
Modified: pkg/src/grow.cpp
===================================================================
--- pkg/src/grow.cpp 2010-01-22 14:20:56 UTC (rev 424)
+++ pkg/src/grow.cpp 2010-01-22 14:43:35 UTC (rev 425)
@@ -20,7 +20,6 @@
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
#include <Rcpp/grow.h>
-#include <Rcpp/Named.h>
namespace Rcpp{
More information about the Rcpp-commits
mailing list