Merge branch 'master' of github.com:RcppCore/Rcpp

Author: eddelbuettel

README.md

@@ -54,3 +54,28 @@ always use this Rcpp package instead.
 Additional documentation is available via the [JSS paper](http://www.jstatsoft.org/v40/i08/) by Eddelbuettel and
 Francois (2011, JSS) paper and the [book](http://www.rcpp.org/book) by Eddelbuettel (2013, Springer); 
 see 'citation("Rcpp")' for details.
+
+## Installation
+
+To install Rcpp from github, first make sure you have a [package development environment](http://www.rstudio.com/ide/docs/packages/prerequisites), and then:
+
+```R
+install.packages("devtools")
+devtools::install_github("RcppCore/Rcpp")
+```
+
+Rcpp is also available from CRAN. 
+
+```R
+install.packages( "Rcpp" )
+```
+
+On OSX 10.9 (Mavericks) with Xcode 5.0 it is recommended to install Rcpp from source after 
+setting these variables in `~/.R/Makevars`
+
+```
+CC=clang
+CXX=clang++
+CXXFLAGS= -O3
+```
+

inst/include/Rcpp/internal/wrap_end.h

@@ -2,7 +2,7 @@
 //
 // wrap_end.h: R/C++ interface class library
 //
-// Copyright (C) 2012 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2013 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -23,13 +23,14 @@
 #define Rcpp_internal_wrap_end_h
 
 namespace Rcpp{
+    
     template <typename T>
     inline SEXP module_wrap_dispatch( const T& obj, Rcpp::traits::normal_wrap_tag ){
-    	return wrap( obj ) ;
+        return wrap( obj ) ;
     }
     template <typename T>
     inline SEXP module_wrap_dispatch( const T& obj, Rcpp::traits::pointer_wrap_tag ) {
-    	return wrap( object< typename traits::un_pointer<T>::type >( obj ) ) ;
+        return wrap( object< typename traits::un_pointer<T>::type >( obj ) ) ;
     }
 }