Fix backwards compatibility with R4.1 (#66)

andrjohns · Jul 10, 2024 · 970fe86 · 970fe86
1 parent 8fd9eb4
commit 970fe86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -29,6 +29,7 @@ jobs:
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
           - {os: ubuntu-latest,   r: 'oldrel'}
+          - {os: ubuntu-latest,   r: '4.1'}
 #          - {os: ubuntu-latest,   r: '3.6'}
 
     env:

diff --git a/inst/include/cpp11/environment.hpp b/inst/include/cpp11/environment.hpp
@@ -48,7 +48,12 @@ class environment {
   proxy operator[](const std::string& name) const { return operator[](name.c_str()); }
 
   bool exists(SEXP name) const {
+#if R_VERSION >= R_Version(4, 2, 0)
     return safe[R_existsVarInFrame](env_, name);
+#else
+    SEXP res = safe[Rf_findVarInFrame3](env_, name, FALSE);
+    return res != R_UnboundValue;
+#endif
   }
   bool exists(const char* name) const { return exists(safe[Rf_install](name)); }