[Rcpp-commits] r1605 - in pkg/Rcpp/inst/include/Rcpp/sugar: . operators

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

Author: romain
Date: 2010-06-18 16:03:28 +0200 (Fri, 18 Jun 2010)
New Revision: 1605

Added:
   pkg/Rcpp/inst/include/Rcpp/sugar/operators/operators.h
Modified:
   pkg/Rcpp/inst/include/Rcpp/sugar/operators/logical_operators.h
   pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h
Log:
move operators code into the sugar/operators directory

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/operators/logical_operators.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/operators/logical_operators.h	2010-06-18 14:01:33 UTC (rev 1604)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/operators/logical_operators.h	2010-06-18 14:03:28 UTC (rev 1605)
@@ -22,7 +22,4 @@
 #ifndef Rcpp__sugar__logical_operators_h
 #define Rcpp__sugar__logical_operators_h
 
-#include <Rcpp/sugar/logical_operators__Vector__Vector.h> 
-#include <Rcpp/sugar/logical_operators__Vector__primitive.h> 
-
 #endif

Added: pkg/Rcpp/inst/include/Rcpp/sugar/operators/operators.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/operators/operators.h	                        (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/operators/operators.h	2010-06-18 14:03:28 UTC (rev 1605)
@@ -0,0 +1,40 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// any.h: Rcpp R/C++ interface class library -- any
+//
+// 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__sugar__operators__operators_h
+#define Rcpp__sugar__operators__operators_h
+
+// binary operators
+#include <Rcpp/sugar/operators/Comparator.h>
+#include <Rcpp/sugar/operators/Comparator_With_One_Value.h>
+
+#include <Rcpp/sugar/operators/logical_operators__Vector__Vector.h> 
+#include <Rcpp/sugar/operators/logical_operators__Vector__primitive.h> 
+#include <Rcpp/sugar/operators/plus.h>
+#include <Rcpp/sugar/operators/minus.h>
+#include <Rcpp/sugar/operators/times.h>
+#include <Rcpp/sugar/operators/divides.h>
+
+// unary operators
+#include <Rcpp/sugar/operators/not.h>
+#include <Rcpp/sugar/operators/unary_minus.h>
+
+#endif

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h	2010-06-18 14:01:33 UTC (rev 1604)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h	2010-06-18 14:03:28 UTC (rev 1605)
@@ -28,18 +28,6 @@
 #include <Rcpp/sugar/is_na.h>
 #include <Rcpp/sugar/seq_along.h>
 
-// binary operators
-#include <Rcpp/sugar/operators/Comparator.h>
-#include <Rcpp/sugar/operators/Comparator_With_One_Value.h>
+#include <Rcpp/sugar/operators/operators.h>
 
-#include <Rcpp/sugar/operators/logical_operators.h>
-#include <Rcpp/sugar/operators/plus.h>
-#include <Rcpp/sugar/operators/minus.h>
-#include <Rcpp/sugar/operators/times.h>
-#include <Rcpp/sugar/operators/divides.h>
-
-// unary operators
-#include <Rcpp/sugar/operators/not.h>
-#include <Rcpp/sugar/operators/unary_minus.h>
-
 #endif