merge Dirk's Rcpp changes; also add missing "return *this" in RObject_impl::operator=

Author: kevinushey

ChangeLog

@@ -1,3 +1,13 @@
+2013-12-20  Kevin Ushey  <kevinushey@gmail.com>
+
+  * inst/include/Rcpp/RObject.h: Add missing *this return for
+    RObject_impl::operator=
+
+2013-12-20  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/Rcpp/RObject.h: Applied fix by Kevin Ushey (#88)
+	* inst/include/Rcpp/vector/Vector.h: Ditto (#89)
+
 2013-12-01  Kevin Ushey  <kevinushey@gmail.com>
 
 	* R/Rcpp.package.skeleton.R: Fixed bug relating to user-supplied

inst/NEWS.Rd

@@ -19,6 +19,8 @@
       \item The internal coercion mechanism mapping numerics to strings has
       been updated to better match \R (specifically with \code{Inf}, \code{-Inf},
       and \code{NaN}.)
+      \item Applied two bug fixes to Vector \code{sort()} and \code{RObject}
+      definition spotted and correct by Kevin Ushey
     }
     \item Changes in Rcpp documentation:
     \itemize{

inst/include/Rcpp/RObject.h

@@ -30,7 +30,7 @@ namespace Rcpp{
         /**
          * default constructor. uses R_NilValue
          */ 
-        RObject_Impl() ; 
+        RObject_Impl() {}; 
 
         RCPP_GENERATE_CTOR_ASSIGN(RObject_Impl) 
 
@@ -47,7 +47,8 @@ namespace Rcpp{
          * Assignement operator. Set this SEXP to the given SEXP
          */ 
         RObject_Impl& operator=( SEXP other ){
-            Storage::set__(other) ;    
+            Storage::set__(other) ;
+            return *this;
         }
 
         void update(SEXP){}

inst/include/Rcpp/vector/Vector.h

@@ -239,7 +239,7 @@ class Vector :
     }
 
     Vector& sort(){
-        typename traits::storage_type<RTYPE>* start = internal::r_vector_start<RTYPE>( Storage::get__() ) ;
+        typename traits::storage_type<RTYPE>::type* start = internal::r_vector_start<RTYPE>( Storage::get__() ) ;
         std::sort( 
             start, start + size(), 
             typename traits::comparator_type<RTYPE>::type()