release 1.62.0-1 w/ final forced_return.hpp

eddelbuettel · Nov 18, 2016 · ecfd295 · ecfd295
1 parent c5da748
commit ecfd295
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,9 +1,14 @@
-2016-11-15  Dirk Eddelbuettel  <[email protected]>
+2016-11-18  Dirk Eddelbuettel  <[email protected]>
 
 	* DESCRIPTION: Release 1.62.0-1
 
+	* inst/include/boost/variant/detail/forced_return.hpp: Ensure
+	R_NO_REMAP is defined
+
+2016-11-15  Dirk Eddelbuettel  <[email protected]>
+
 	* inst/include/boost/variant/detail/forced_return.hpp
-	(forced_return_no_return): Call (Rf_)error() not abort()
+	(forced_return_no_return): Call Rf_error() not abort()
 
 2016-11-13  Dirk Eddelbuettel  <[email protected]>
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: BH
 Type: Package
 Title: Boost C++ Header Files
 Version: 1.62.0-1
-Date: 2016-11-15
+Date: 2016-11-18
 Author: Dirk Eddelbuettel, John W. Emerson and Michael J. Kane
 Maintainer: Dirk Eddelbuettel <[email protected]>
 Description: Boost provides free peer-reviewed portable C++ source 

diff --git a/inst/include/boost/variant/detail/forced_return.hpp b/inst/include/boost/variant/detail/forced_return.hpp
@@ -17,6 +17,9 @@
 #include <boost/variant/detail/generic_result_type.hpp>
 #include <boost/assert.hpp>
 #include <cstdlib> // std::abort
+#ifndef R_NO_REMAP
+#define R_NO_REMAP
+#endif
 #include <R_ext/Error.h>        // Rf_error()
 
 #ifdef BOOST_MSVC
@@ -29,7 +32,7 @@ namespace boost { namespace detail { namespace variant {
 BOOST_NORETURN inline void forced_return_no_return() { // fixes `must return a value` warnings
     using namespace std;
     //abort(); // some implementations have no std::abort
-    Rf_error("Forced return to R");
+    ::Rf_error("Forced return to R");
 }
 
 

diff --git a/local/scripts/CreateBoost.sh b/local/scripts/CreateBoost.sh
@@ -13,7 +13,7 @@ pkgdir="${HOME}/git/bh"
 boosttargz="boost_1_62_0.tar.gz"
 ## -- current package version and date (and other metadata as needed)
 version="1.62.0-1"
-date="2016-11-13"
+date="2016-11-18"
 
 
 

diff --git a/man/BH-package.Rd b/man/BH-package.Rd
@@ -16,7 +16,7 @@
 Package: \tab BH\cr
 Type: \tab Package\cr
 Version: \tab 1.62.0-1\cr
-Date: \tab 2016-11-13\cr
+Date: \tab 2016-11-18\cr
 License: \tab BSL-1.0\cr
 }
   Boost provides free peer-reviewed portable C++ source