Merge pull request #207 from RcppCore/feature/four-part-version-macro

Feature/four part version macro

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,16 @@
+2014-11-23  Dirk Eddelbuettel  <edd@debian.org>
+
+        * inst/include/Rcpp/config.h: New macro RcppDevVersion to account for
+        four-part development versions such as the current 0.11.3.2
+        * DESCRIPTION: Version incremented to 0.11.3.2
+
+2014-11-23  Romain Francois  <romain@r-enthusiasts.com>
+
+        * inst/include/Rcpp/exceptions.h: Richer formatting for Rcpp::stop
+        * inst/include/Rcpp/utils/tinyformat.h: Backend for formattinh
+        * inst/unitTests/runit.misc.R: Added new unit test
+        * inst/unitTests/cpp/misc.cpp: C++ backend for test
+
 2014-11-19  Dirk Eddelbuettel  <edd@debian.org>
 
         * .travis.yml: Temporary stop-gap measure of setting CRAN to something

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.11.3.1
-Date: 2014-10-29
+Version: 0.11.3.2
+Date: 2014-11-23
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Douglas Bates, and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>

inst/NEWS.Rd

@@ -11,8 +11,9 @@
       \item The \code{[dpq]nbinom_mu()} scalar functions are now available via 
       the \code{R::} namespace when R 3.1.2 or newer is used.
       \item Add an additional test for AIX before attempting to include \code{execinfo.h}.
-      \item Rcpp::stop gains a printf like syntax, inspired from the implementation in
-      Rcpp11, using tinyformat
+      \item \code{Rcpp::stop} now supports improved \code{printf}-like syntax
+      using the small tinyformat header-only library (following a similar
+      implementation in Rcpp11)
     }
     \item Changes in Rcpp Attributes:
     \itemize{

inst/include/Rcpp/config.h

@@ -24,7 +24,11 @@
 
 #define Rcpp_Version(v,p,s) (((v) * 65536) + ((p) * 256) + (s))
 
+// at this point 0.11.4 is the next but as of yet unreleased version
 #define RCPP_VERSION Rcpp_Version(0,11,4)
 
+#define RcppDevVersion(maj, min, rev, dev)  (((maj)*1e6) + ((min)*1e4) + ((rev)*1e2) + (dev))
+#define RCPP_DEV_VERSION RcppDevVersion(0,11,3,2)
+
 #endif