Merge branch 'master' into feature/more_tests

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,26 @@
+2026-01-23  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/Rcpp/DataFrame.h (nrow): Use R_nrow() with R >= 4.6.0
+	* inst/include/Rcpp/proxy/AttributeProxy.h (attributeNames): Use
+	R_getAttribNames() with R >= 4.6.0;
+	* inst/include/Rcpp/proxy/AttributeProxy.h (hasAttribute): Use
+	R_hasAttrib with R >= 4.6.0
+
+2026-01-22  Dirk Eddelbuettel  <edd@debian.org>
+
+	* DESCRIPTION (Version, Date): Roll micro version and date
+	* inst/include/Rcpp/config.h: Idem
+
+2026-01-21  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/Rcpp/date_datetime/Datetime.h: Fractional seconds type
+	switched to 'int' for consistency, print format string re-adjusted
+
+2026-01-20  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/Rcpp/date_datetime/Datetime.h (format): Correct a
+	format string reflecting 'unsigned int' rather than 'int'
+
 2026-01-13  Dirk Eddelbuettel  <edd@debian.org>
 
 	* inst/tinytest/cpp/attributes_extended.cpp: New unit tests

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 1.1.1.1
-Date: 2026-01-12
+Version: 1.1.1.3
+Date: 2026-01-23
 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org",
                     comment = c(ORCID = "0000-0001-6419-907X")),
              person("Romain", "Francois", role = "aut",

inst/NEWS.Rd

@@ -3,6 +3,20 @@
 \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 release version 1.1.2 [unreleased] (expected 2026-07-xx)}{
+  \itemize{
+    \item Changes in Rcpp API:
+    \itemize{
+      \item Use of \code{execinfo.h} is again conditional to avoid build
+      complexity (Dirk in \ghpr{1445} addressing \ghit{1442})
+      \item An internal state component for \code{Datetime} is now \code{int}
+      (Dirk in \ghpr{1448} and \ghpr{1449} fixing \ghpr{1447})
+      \item Three new (in R 4.6.0) attribute accessors are used conditionally
+      (Dirk in \ghpr{1450} closing \ghit{1432})
+    }
+  }
+}
+
 \section{Changes in Rcpp release version 1.1.1 (2026-01-08)}{
   \itemize{
     \item Changes in Rcpp API:

inst/include/Rcpp/DataFrame.h

@@ -1,8 +1,7 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
-//
+
 // DataFrame.h: Rcpp R/C++ interface class library -- data frames
 //
-// Copyright (C) 2010 - 2025  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2026  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -67,8 +66,12 @@ namespace Rcpp{
         // discussed in #1430 is also possible and preferable. We also switch
         // to returning R_xlen_t which as upcast from int is safe
         inline R_xlen_t nrow() const {
+#if R_VERSION < R_Version(4,6,0)
             Shield<SEXP> rn{Rf_getAttrib(Parent::get__(), R_RowNamesSymbol)};
             return Rf_xlength(rn);
+#else
+            return R_nrow(Parent::get__());
+#endif
         }
 
         template <typename T>

inst/include/Rcpp/config.h

@@ -1,8 +1,7 @@
 
-
 // config.h: Rcpp R/C++ interface class library -- Rcpp configuration
 //
-// Copyright (C) 2010 - 2025  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2026  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -31,7 +30,7 @@
 #define RCPP_VERSION_STRING     "1.1.1"
 
 // the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
-#define RCPP_DEV_VERSION        RcppDevVersion(1,1,1,1)
-#define RCPP_DEV_VERSION_STRING "1.1.1.1"
+#define RCPP_DEV_VERSION        RcppDevVersion(1,1,1,3)
+#define RCPP_DEV_VERSION_STRING "1.1.1.3"
 
 #endif

inst/include/Rcpp/date_datetime/Datetime.h

@@ -1,8 +1,7 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
-//
+
 // Datetime.h: Rcpp R/C++ interface class library -- Datetime (POSIXct)
 //
-// Copyright (C) 2010 - 2016  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2026  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -94,7 +93,7 @@ namespace Rcpp {
     private:
         double m_dt;            // fractional seconds since epoch
         struct tm m_tm;         // standard time representation
-        unsigned int m_us;      // microsecond (to complement m_tm)
+        int m_us;               // microsecond (to complement m_tm)
 
         // update m_tm based on m_dt
         void update_tm() {

inst/include/Rcpp/proxy/AttributeProxy.h

@@ -80,13 +80,11 @@ class AttributeProxyPolicy {
     std::vector<std::string> attributeNames() const {
         std::vector<std::string> v;
 #if R_VERSION >= R_Version(4, 6, 0)
-        auto visitor = [](SEXP name, SEXP attr, void* data) -> SEXP {
-            std::vector<std::string>* ptr = static_cast<std::vector<std::string>*>(data);
-            std::string s{CHAR(Rf_asChar(name))};
-            ptr->push_back(s);
-            return NULL;
-        };
-        R_mapAttrib(static_cast<const CLASS&>(*this).get__(), visitor, static_cast<void*>(&v));
+        SEXP attrs = R_getAttribNames( static_cast<const CLASS&>(*this));
+        R_xlen_t n = XLENGTH(attrs);
+        for (R_xlen_t i = 0; i < n; i++) {
+            v.push_back(std::string(CHAR(STRING_ELT(attrs, i))));
+        }
 #else
         SEXP attrs = ATTRIB( static_cast<const CLASS&>(*this).get__());
         while( attrs != R_NilValue ){
@@ -98,7 +96,11 @@ class AttributeProxyPolicy {
     }
 
     bool hasAttribute(const std::string& attr) const {
+#if R_VERSION >= R_Version(4, 6, 0)
+        return R_hasAttrib(static_cast<const CLASS&>(*this).get__(), Rf_install(attr.c_str()));
+#else
         return static_cast<const CLASS&>(*this).attr(attr) != R_NilValue;
+#endif
     }