Skip to content

Commit 4f79b74

Browse files
expand on hadley's instructions and mention OSX Mavericks.
2 parents a192096 + 3b975be commit 4f79b74

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

README.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,28 @@ always use this Rcpp package instead.
5353
Additional documentation is available via the [JSS paper](http://www.jstatsoft.org/v40/i08/) by Eddelbuettel and
5454
Francois (2011, JSS) paper and the [book](http://www.rcpp.org/book) by Eddelbuettel (2013, Springer);
5555
see 'citation("Rcpp")' for details.
56+
57+
## Installation
58+
59+
To install Rcpp from github, first make sure you have a [package development environment](http://www.rstudio.com/ide/docs/packages/prerequisites), and then:
60+
61+
```R
62+
install.packages("devtools")
63+
devtools::install_github("RcppCore/Rcpp")
64+
```
65+
66+
Rcpp is also available from CRAN.
67+
68+
```R
69+
install.packages( "Rcpp" )
70+
```
71+
72+
On OSX 10.9 (Mavericks) with Xcode 5.0 it is recommended to install Rcpp from source after
73+
setting these variables in `~/.R/Makevars`
74+
75+
```
76+
CC=clang
77+
CXX=clang++
78+
CXXFLAGS= -O3
79+
```
80+

inst/include/Rcpp/internal/wrap_end.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// wrap_end.h: R/C++ interface class library
44
//
5-
// Copyright (C) 2012 Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2012 - 2013 Dirk Eddelbuettel and Romain Francois
66
//
77
// This file is part of Rcpp.
88
//
@@ -23,13 +23,14 @@
2323
#define Rcpp_internal_wrap_end_h
2424

2525
namespace Rcpp{
26+
2627
template <typename T>
2728
inline SEXP module_wrap_dispatch( const T& obj, Rcpp::traits::normal_wrap_tag ){
28-
return wrap( obj ) ;
29+
return wrap( obj ) ;
2930
}
3031
template <typename T>
3132
inline SEXP module_wrap_dispatch( const T& obj, Rcpp::traits::pointer_wrap_tag ) {
32-
return wrap( object< typename traits::un_pointer<T>::type >( obj ) ) ;
33+
return wrap( object< typename traits::un_pointer<T>::type >( obj ) ) ;
3334
}
3435
}
3536

0 commit comments

Comments
 (0)