Merge pull request #1098 from RcppCore/bugfix/r-external-ptr-addr

use documented R API function for extptr addr

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,14 @@
+2020-07-06  Dirk Eddelbuettel  <[email protected]>
+
+        * DESCRIPTION (Version, Date): Roll minor version
+        * inst/include/Rcpp/config.h: Idem
+
+2020-07-06  Kevin Ushey  <[email protected]>
+
+	* inst/include/Rcpp/module/class.h: EXTPTR_PTR -> R_ExternalPtrAddr
+	* src/api.cpp: Idem
+	* src/module.cpp: Idem
+
 2020-07-01  Dirk Eddelbuettel  <[email protected]>
 
         * DESCRIPTION (Date, Version): Release 1.0.5

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 1.0.5
-Date: 2020-07-01
+Version: 1.0.5.1
+Date: 2020-07-06
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <[email protected]>

inst/NEWS.Rd

@@ -3,6 +3,17 @@
 \newcommand{\ghpr}{\href{https://github.com/RcppCore/Rcpp/pull/#1}{##1}}
 \newcommand{\ghit}{\href{https://github.com/RcppCore/Rcpp/issues/#1}{##1}}
 
+\section{Changes in Rcpp patch release version 1.0.6 (2021-01-xx)}{
+  \itemize{
+    \item Changes in Rcpp API:
+    \itemize{
+      \item Replace remaining few uses of \code{EXTPTR_PTR} with
+      \code{R_ExternalPtrAddr} (Kevin in \ghpr{1098} fixing
+      \ghit{1097}).
+    }
+  }
+}
+
 \section{Changes in Rcpp patch release version 1.0.5 (2020-07-01)}{
   \itemize{
     \item Changes in Rcpp API:

inst/include/Rcpp/config.h

@@ -30,7 +30,7 @@
 #define RCPP_VERSION_STRING     "1.0.5"
 
 // the current source snapshot
-#define RCPP_DEV_VERSION        RcppDevVersion(1,0,5,0)
-#define RCPP_DEV_VERSION_STRING "1.0.5"
+#define RCPP_DEV_VERSION        RcppDevVersion(1,0,5,1)
+#define RCPP_DEV_VERSION_STRING "1.0.5.1"
 
 #endif

inst/include/Rcpp/module/class.h

@@ -167,7 +167,7 @@
         SEXP invoke( SEXP method_xp, SEXP object, SEXP *args, int nargs ){
             BEGIN_RCPP
 
-                vec_signed_method* mets = reinterpret_cast< vec_signed_method* >( EXTPTR_PTR( method_xp ) ) ;
+                vec_signed_method* mets = reinterpret_cast< vec_signed_method* >( R_ExternalPtrAddr( method_xp ) ) ;
             typename vec_signed_method::iterator it = mets->begin() ;
             int n = mets->size() ;
             method_class* m = 0 ;
@@ -194,7 +194,7 @@
         SEXP invoke_void( SEXP method_xp, SEXP object, SEXP *args, int nargs ){
             BEGIN_RCPP
 
-                vec_signed_method* mets = reinterpret_cast< vec_signed_method* >( EXTPTR_PTR( method_xp ) ) ;
+                vec_signed_method* mets = reinterpret_cast< vec_signed_method* >( R_ExternalPtrAddr( method_xp ) ) ;
             typename vec_signed_method::iterator it = mets->begin() ;
             int n = mets->size() ;
             method_class* m = 0 ;
@@ -216,7 +216,7 @@
         SEXP invoke_notvoid( SEXP method_xp, SEXP object, SEXP *args, int nargs ){
             BEGIN_RCPP
 
-                vec_signed_method* mets = reinterpret_cast< vec_signed_method* >( EXTPTR_PTR( method_xp ) ) ;
+                vec_signed_method* mets = reinterpret_cast< vec_signed_method* >( R_ExternalPtrAddr( method_xp ) ) ;
             typename vec_signed_method::iterator it = mets->begin() ;
             int n = mets->size() ;
             method_class* m = 0 ;
@@ -393,14 +393,14 @@
 
         SEXP getProperty( SEXP field_xp , SEXP object) {
             BEGIN_RCPP
-                prop_class* prop = reinterpret_cast< prop_class* >( EXTPTR_PTR( field_xp ) ) ;
+                prop_class* prop = reinterpret_cast< prop_class* >( R_ExternalPtrAddr( field_xp ) ) ;
             return prop->get( XP(object) );
             END_RCPP
                 }
 
         void setProperty( SEXP field_xp, SEXP object, SEXP value)  {
             BEGIN_RCPP
-                prop_class* prop = reinterpret_cast< prop_class* >( EXTPTR_PTR( field_xp ) ) ;
+                prop_class* prop = reinterpret_cast< prop_class* >( R_ExternalPtrAddr( field_xp ) ) ;
             return prop->set( XP(object), value );
             VOID_END_RCPP
                 }

src/api.cpp

@@ -145,7 +145,7 @@ const char* short_file_name(const char* file) {                 // #nocov start
 // [[Rcpp::internal]]
 SEXP as_character_externalptr(SEXP xp) {
     char buffer[20];
-    snprintf(buffer, 20, "%p", (void*)EXTPTR_PTR(xp));
+    snprintf(buffer, 20, "%p", (void*)R_ExternalPtrAddr(xp));
     return Rcpp::wrap((const char*)buffer);
 }                                                               // #nocov end
 

src/module.cpp

@@ -53,7 +53,7 @@ RCPP_FUN_2(Rcpp::CppClass, Module__get_class, XP_Module module, std::string cl)
     return module->get_class(cl);
 }
 RCPP_FUN_1(bool, CppObject__needs_init, SEXP xp) {					// #nocov start
-    return EXTPTR_PTR(xp) == 0;
+    return R_ExternalPtrAddr(xp) == 0;
 }
 RCPP_FUN_1(Rcpp::CharacterVector, CppClass__methods, XP_Class cl) {
     return cl->method_names();