remove DottedPair since we never use it, we have Language and Pairlist

romainfrancois · romainfrancois · commit a9e2d247967c · 2013-10-03T16:59:53.000+02:00
diff --git a/inst/include/Rcpp.h b/inst/include/Rcpp.h
@@ -53,7 +53,6 @@
 #include <Rcpp/XPtr.h>
 #include <Rcpp/Symbol.h>
 #include <Rcpp/Language.h>
-#include <Rcpp/DottedPair.h>
 #include <Rcpp/Pairlist.h>
 #include <Rcpp/Function.h>
 #include <Rcpp/WeakReference.h>
diff --git a/inst/include/Rcpp/DottedPair.h b/inst/include/Rcpp/DottedPair.h
diff --git a/inst/include/Rcpp/api/meat/DottedPairImpl.h b/inst/include/Rcpp/api/meat/DottedPairImpl.h
@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp11.  If not, see <http://www.gnu.org/licenses/>.
                     
-#ifndef Rcpp_api_meat_DottedPair_h
-#define Rcpp_api_meat_DottedPair_h
+#ifndef Rcpp_api_meat_DottedPairImpl_h
+#define Rcpp_api_meat_DottedPairImpl_h
 
 namespace Rcpp{ 
 
diff --git a/inst/include/Rcpp/api/meat/meat.h b/inst/include/Rcpp/api/meat/meat.h
@@ -27,7 +27,7 @@
 #include <Rcpp/api/meat/Language.h>
 #include <Rcpp/api/meat/DataFrame.h>
 #include <Rcpp/api/meat/Environment.h>
-#include <Rcpp/api/meat/DottedPair.h>
+#include <Rcpp/api/meat/DottedPairImpl.h>
 #include <Rcpp/api/meat/Vector.h>
 #include <Rcpp/api/meat/Function.h>
 #include <Rcpp/api/meat/Matrix.h>
diff --git a/src/api.cpp b/src/api.cpp
@@ -245,7 +245,6 @@ namespace Rcpp {
 
     // }}}
   
-    // {{{ DottedPair
     SEXP grow( SEXP head, SEXP tail ){
         Scoped<SEXP> x = head ;
         Scoped<SEXP> res = Rf_cons( x, tail ) ;
@@ -264,8 +263,6 @@ namespace Rcpp {
         }
     }
     
-    // }}}
-    
     // {{{ Promise
     Promise::Promise(SEXP x) {
         if( TYPEOF(x) != PROMSXP )

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,6 @@ namespace Rcpp {`
`245`	`245`
`246`	`246`	`// }}}`
`247`	`247`
`248`		`- // {{{ DottedPair`
`249`	`248`	`SEXP grow( SEXP head, SEXP tail ){`
`250`	`249`	`Scoped<SEXP> x = head ;`
`251`	`250`	`Scoped<SEXP> res = Rf_cons( x, tail ) ;`
`@@ -264,8 +263,6 @@ namespace Rcpp {`
`264`	`263`	`}`
`265`	`264`	`}`
`266`	`265`
`267`		`- // }}}`
`268`		`-`
`269`	`266`	`// {{{ Promise`
`270`	`267`	`Promise::Promise(SEXP x) {`
`271`	`268`	`if( TYPEOF(x) != PROMSXP )`