Merge branch 'main' into b-extptr-leak

Author: krlmlr

.github/workflows/R-CMD-check.yaml

@@ -24,20 +24,21 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {os: macos-13,       r: 'oldrel'}
           - {os: macos-latest,   r: 'release'}
 
           - {os: windows-latest, r: 'release'}
           # use 4.1 to check with rtools40's older compiler
           - {os: windows-latest, r: '4.1'}
 
           # Use older ubuntu to maximise backward compatibility
-          - {os: ubuntu-20.04,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-20.04,   r: 'release'}
-          - {os: ubuntu-20.04,   r: 'release', custom: 'no-cpp11test'}
-          - {os: ubuntu-20.04,   r: 'oldrel-1'}
-          - {os: ubuntu-20.04,   r: 'oldrel-2'}
-          - {os: ubuntu-20.04,   r: 'oldrel-3'}
-          - {os: ubuntu-20.04,   r: 'oldrel-4'}
+          - {os: ubuntu-22.04,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-22.04,   r: 'release'}
+          - {os: ubuntu-22.04,   r: 'release', custom: 'no-cpp11test'}
+          - {os: ubuntu-22.04,   r: 'oldrel-1'}
+          - {os: ubuntu-22.04,   r: 'oldrel-2'}
+          - {os: ubuntu-22.04,   r: 'oldrel-3'}
+          - {os: ubuntu-22.04,   r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/format.yaml

@@ -9,15 +9,15 @@ name: format_check
 
 jobs:
   format_check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
 
       - name: Install ClangFormat
-        run: sudo apt-get install -y clang-format-10
+        run: sudo apt-get install -y clang-format-12
 
       - name: Run ClangFormat
-        run: make format clang_format=clang-format-10
+        run: make format clang_format=clang-format-12
 
       - name: Check for a non-empty diff
         run: git diff-files -U --exit-code

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: cpp11
 Title: A C++11 Interface for R's C Interface
-Version: 0.5.1.9000
+Version: 0.5.2.9000
 Authors@R:
     c(
       person("Davis", "Vaughan", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-4777-038X")),

NEWS.md

@@ -1,5 +1,9 @@
 # cpp11 (development version)
 
+# cpp11 0.5.2
+
+* Fixed an issue related to `-Wdeprecated-literal-operator` (#447, @andrjohns).
+
 # cpp11 0.5.1
 
 * cpp11 now requires R >=4.0.0, in line with the

inst/include/cpp11/R.hpp

@@ -49,7 +49,7 @@
 namespace cpp11 {
 namespace literals {
 
-constexpr R_xlen_t operator"" _xl(unsigned long long int value) { return value; }
+constexpr R_xlen_t operator""_xl(unsigned long long int value) { return value; }
 
 }  // namespace literals
 

inst/include/cpp11/named_arg.hpp

@@ -39,7 +39,7 @@ class named_arg {
 
 namespace literals {
 
-inline named_arg operator"" _nm(const char* name, std::size_t) { return named_arg(name); }
+inline named_arg operator""_nm(const char* name, std::size_t) { return named_arg(name); }
 
 }  // namespace literals
 

inst/include/fmt/format.h

@@ -2749,7 +2749,7 @@ constexpr auto operator""_a()
   return {};
 }
 #else
-constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg<char> {
+constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg<char> {
   return {s};
 }
 #endif
@@ -2764,7 +2764,7 @@ constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg<char> {
     std::string message = "The answer is {}"_format(42);
   \endrst
  */
-constexpr auto operator"" _format(const char* s, size_t n)
+constexpr auto operator""_format(const char* s, size_t n)
     -> detail::udl_formatter<char> {
   return {{s, n}};
 }

vignettes/cpp11.Rmd

@@ -1154,4 +1154,4 @@ If you would like to dive deeper or write more complex functions other resources
     (Follow the links under notes.)
 
 Writing performant code may also require you to rethink your basic approach: a solid understanding of basic data structures and algorithms is very helpful here.
-That's beyond the scope of this vignette, but I'd suggest the [*Algorithm Design Manual*](https://www.algorist.com/) MIT's [*Introduction to Algorithms*](https://web.archive.org/web/20200604134756/https://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-046j-introduction-to-algorithms-sma-5503-fall-2005/), *Algorithms* by Robert Sedgewick and Kevin Wayne which has a free [online textbook](http://algs4.cs.princeton.edu/home/) and a matching [Coursera course](https://www.coursera.org/learn/algorithms-part1).
+That's beyond the scope of this vignette, but I'd suggest the *Algorithm Design Manual*, MIT's [*Introduction to Algorithms*](https://web.archive.org/web/20200604134756/https://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-046j-introduction-to-algorithms-sma-5503-fall-2005/), *Algorithms* by Robert Sedgewick and Kevin Wayne which has a free [online textbook](http://algs4.cs.princeton.edu/home/) and a matching [Coursera course](https://www.coursera.org/learn/algorithms-part1).