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

Author: romainfrancois

.travis.yml

@@ -6,6 +6,8 @@
 
 language: c
 
+sudo: required
+
 env:
   global:
     - R_BUILD_ARGS="--no-build-vignettes --no-manual"
@@ -21,6 +23,7 @@ before_install:
   - sudo apt-get update -q
 
 install:
+  ## note that we currently depend on highlight 0.4.4.1 from the PPA as 0.4.5 has issues
   - ./travis-tool.sh install_aptget r-cran-runit r-cran-inline r-cran-rbenchmark r-cran-highlight r-cran-pkgkitten
 
 script: 

ChangeLog

@@ -1,3 +1,11 @@
+2015-04-22  Kevin Ushey  <kevinushey@gmail.com>
+
+        * inst/include/Rcpp/utils/tinyformat.h: don't use C++11 features
+
+2015-04-14  Dirk Eddelbuettel  <edd@debian.org>
+
+        * .travis.yml (sudo): Adding 'sudo: required' to force older Travis backend
+
 2014-04-14  Romain Francois  <romain@r-enthusiasts.com>
 
         * inst/include/Rcpp/api/meat/is.h: added is__simple<Rcomplex>
@@ -13,6 +21,11 @@
         * inst/include/Rcpp/*: Removed BEGIN_RCPP and END_RCPP from a few files
         * src/Module.cpp: But added here
 
+2015-04-19  Jonathan Marshall <jmarshall@xbmc.org>
+
+        * inst/include/Rcpp/vector/string_proxy.h: Adds empty() constructor
+        * inst/include/Rcpp/vector/const_string_proxy.h: Ditto
+
 2015-03-18  Dmitrii Meleshko  <Dmitrii@MeleshkoDima.none>
 
         * inst/include/Rcpp/vector/Matrix.h: Added default ctor for 0x0 matrix
@@ -38,7 +51,7 @@
 
         * inst/include/RcppCommon.h: Move headers into major/minor protection
         * inst/include/Rcpp/r/headers.h: New file
- 
+
 2015-03-04  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION: Release 0.11.5

inst/NEWS.Rd

@@ -11,6 +11,7 @@
       \item Header files try harder not to let macroas leak out.
       \item Matrices now have a default constructor for zero-by-zero dimension
       matrices (via pull request by Dmitrii Meleshko).
+      \item A new \code{empty()} string constructor was added.
     }
     \item Changes in Rcpp Attributes:
     \itemize{

inst/include/Rcpp/utils/tinyformat.h

@@ -128,10 +128,8 @@ namespace Rcpp {
 }
 #define TINYFORMAT_ERROR(REASON) ::Rcpp::stop(REASON)
 
-// Define for C++11 variadic templates which make the code shorter & more
-// general.  If you don't define this, C++11 support is autodetected below.
-// #define TINYFORMAT_USE_VARIADIC_TEMPLATES
-
+// don't use C++11 features (support older compilers)
+#define TINYFORMAT_NO_VARIADIC_TEMPLATES
 
 //------------------------------------------------------------------------------
 // Implementation details.

inst/include/Rcpp/vector/const_string_proxy.h

@@ -93,6 +93,7 @@ namespace internal{
 		inline iterator begin() const { return CHAR( STRING_ELT( *parent, index ) ) ; }
 		inline iterator end() const { return begin() + size() ; }
 		inline int size() const { return strlen( begin() ) ; }
+		inline bool empty() const { return *begin() == '\0' ; }
 		inline reference operator[]( int n ){ return *( begin() + n ) ; }
 
 		bool operator==( const char* other){

inst/include/Rcpp/vector/string_proxy.h

@@ -158,6 +158,7 @@ namespace internal{
 		inline iterator begin() const { return CHAR( STRING_ELT( *parent, index ) ) ; }
 		inline iterator end() const { return begin() + size() ; }
 		inline int size() const { return strlen( begin() ) ; }
+		inline bool empty() const { return *begin() == '\0' ; }
 		inline reference operator[]( int n ){ return *( begin() + n ) ; }
 
 		template <typename UnaryOperator>