Merge pull request #93 from kevinushey/master

Nice work, and thanks.  Can't believe I didn't notice about the missing `#include`. Doh!

Author: eddelbuettel

inst/include/Rcpp.h

@@ -25,6 +25,7 @@
 
 /* it is important that this comes first */
 #include <RcppCommon.h>
+#include <Rcpp/routines.h>
 
 #include <Rcpp/RObject.h>
 

inst/include/Rcpp/DataFrame.h

@@ -41,21 +41,21 @@ namespace Rcpp{
 
         DataFrame_Impl() : Parent( internal::empty_data_frame() ){}
         DataFrame_Impl(SEXP x) {
-            set_sexp(x);     
+            set__(x);     
         }
         DataFrame_Impl( const DataFrame_Impl& other){
-            set_sexp(other) ;    
+            set__(other) ;    
         }
 
         template <typename T>
         DataFrame_Impl( const T& obj ) ;
 
         DataFrame_Impl& operator=( DataFrame_Impl& other){
-            if( *this != other) set_sexp(other) ;    
+            if( *this != other) set__(other) ;    
         }
 
         DataFrame_Impl& operator=( SEXP x){
-            set_sexp(x) ;
+            set__(x) ;
             return *this ;
         }
 
@@ -70,7 +70,7 @@ namespace Rcpp{
         #include <Rcpp/generated/DataFrame_generated.h>           
 
     private:
-        void set_sexp(SEXP x){
+        void set__(SEXP x){
             if( ::Rf_inherits( x, "data.frame" )){
                 Parent::set__( x ) ;
             } else{

inst/include/Rcpp/api/meat/DataFrame.h

@@ -23,7 +23,7 @@ namespace Rcpp{
      template <template <class> class StoragePolicy>
      template <class T>
      DataFrame_Impl<StoragePolicy>::DataFrame_Impl( const T& obj){
-        set_sexp( wrap(obj) ) ;     
+        set__( wrap(obj) ) ;     
      }
 
 }

inst/include/Rcpp/api/meat/Matrix.h

@@ -64,7 +64,7 @@ namespace Rcpp{
     Matrix<RTYPE, StoragePolicy>& Matrix<RTYPE,StoragePolicy>::operator=(const Matrix& other) {
         SEXP x = VECTOR::get__() ;
         if( ! ::Rf_isMatrix(x) ) not_compatible("not a matrix") ;
-        VECTOR::set_sexp( x ) ;
+        VECTOR::set__( x ) ;
         nrows = other.nrows ;
         return *this ;
     }

inst/include/Rcpp/vector/SubMatrix.h

@@ -73,7 +73,7 @@ Matrix<RTYPE,StoragePolicy>& Matrix<RTYPE,StoragePolicy>::operator=( const SubMa
     int nc = sub.ncol(), nr = sub.nrow() ;
     if( nc != nrow() || nr != ncol() ){
         nrows = nr ;
-        VECTOR::set_sexp( Rf_allocMatrix( RTYPE, nr, nc ) ) ;
+        VECTOR::set__( Rf_allocMatrix( RTYPE, nr, nc ) ) ;
 	}
 	iterator start = VECTOR::begin() ;
 	iterator rhs_it ;