Merge branch 'master' of github.com:dcdillon/RcppHoney

Author: dcdillon

.travis.yml

@@ -8,26 +8,23 @@ language: c
 
 sudo: required
 
-env:
-  global:
-    - R_BUILD_ARGS="--no-build-vignettes --no-manual"
-    - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
-    
+dist: trusty
+
 before_install:
- ## r-travis by Craig Citro et al
- - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
- - chmod 755 ./travis-tool.sh
- - ./travis-tool.sh bootstrap
+  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
+  - chmod 755 ./travis-tool.sh
+  - ./travis-tool.sh bootstrap
 
 install:
- - ./travis-tool.sh install_github dcdillon/RcppHoney
+  - ./travis-tool.sh install_aptget r-cran-rcpp 
 
 script:
- - true
-after_script:
- - ./travis-tool.sh dump_logs
+  - ./travis-tool.sh run_tests
+
+after_failure:
+  - ./travis-tool.sh dump_logs
 
 notifications:
- email:
-   on_success: change
-   on_failure: change
+  email:
+    on_success: change
+    on_failure: change

README.md

@@ -1,4 +1,4 @@
-# RcppHoney
+# RcppHoney ![Build Status](https://travis-ci.org/dcdillon/cpuaff.svg?branch=master)
 
 ### Description
 
@@ -70,7 +70,7 @@ Rcpp::NumericVector example_manually_hooked() {
     // RcppHoney::NumericVector and simply return it to R.  These classes inherit from their
     // Rcpp counterparts and add a new constructor.  The only copy of the data, in this case, is when
     // we assign our expression to retval.  Since it is then a "native" R type, returning it is a
-    // shallow copy.  Alternatively we could simply write this as:
+    // shallow copy.  Alternatively we could write this as:
     //     return Rcpp::wrap(1 + v + RcppHoney::log(v) - v - 1 + RcppHoney::sqrt(v) + -v2);
 
     RcppHoney::NumericVector retval