From 7c13e77726e9600e55297958fe62ec50c596da03 Mon Sep 17 00:00:00 2001 From: Mauricio 'Pacha' Vargas Sepulveda Date: Thu, 5 Sep 2024 01:20:21 -0400 Subject: [PATCH] fix compilation warnings on Niagara clusters --- inst/include/cpp11/doubles.hpp | 2 +- inst/include/cpp11/integers.hpp | 2 +- inst/include/cpp11/list.hpp | 2 +- inst/include/cpp11/logicals.hpp | 2 +- inst/include/cpp11/r_vector.hpp | 4 ++-- inst/include/cpp11/raws.hpp | 2 +- inst/include/cpp11/strings.hpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inst/include/cpp11/doubles.hpp b/inst/include/cpp11/doubles.hpp index 5a5cd12f..dcab086d 100644 --- a/inst/include/cpp11/doubles.hpp +++ b/inst/include/cpp11/doubles.hpp @@ -48,7 +48,7 @@ inline void r_vector::get_region(SEXP x, R_xlen_t i, R_xlen_t n, typename r_vector::underlying_type* buf) { // NOPROTECT: likely too costly to unwind protect here REAL_GET_REGION(x, i, n, buf); -}; +} template <> inline bool r_vector::const_iterator::use_buf(bool is_altrep) { diff --git a/inst/include/cpp11/integers.hpp b/inst/include/cpp11/integers.hpp index ff82cda5..68fd8e4d 100644 --- a/inst/include/cpp11/integers.hpp +++ b/inst/include/cpp11/integers.hpp @@ -49,7 +49,7 @@ inline void r_vector::get_region(SEXP x, R_xlen_t i, R_xlen_t n, typename r_vector::underlying_type* buf) { // NOPROTECT: likely too costly to unwind protect here INTEGER_GET_REGION(x, i, n, buf); -}; +} template <> inline bool r_vector::const_iterator::use_buf(bool is_altrep) { diff --git a/inst/include/cpp11/list.hpp b/inst/include/cpp11/list.hpp index b480374b..be29bb2a 100644 --- a/inst/include/cpp11/list.hpp +++ b/inst/include/cpp11/list.hpp @@ -52,7 +52,7 @@ template <> inline void r_vector::get_region(SEXP x, R_xlen_t i, R_xlen_t n, typename r_vector::underlying_type* buf) { cpp11::stop("Unreachable!"); -}; +} template <> inline bool r_vector::const_iterator::use_buf(bool is_altrep) { diff --git a/inst/include/cpp11/logicals.hpp b/inst/include/cpp11/logicals.hpp index 0b197373..45d3d1cc 100644 --- a/inst/include/cpp11/logicals.hpp +++ b/inst/include/cpp11/logicals.hpp @@ -48,7 +48,7 @@ inline void r_vector::get_region(SEXP x, R_xlen_t i, R_xlen_t n, typename r_vector::underlying_type* buf) { // NOPROTECT: likely too costly to unwind protect here LOGICAL_GET_REGION(x, i, n, buf); -}; +} template <> inline bool r_vector::const_iterator::use_buf(bool is_altrep) { diff --git a/inst/include/cpp11/r_vector.hpp b/inst/include/cpp11/r_vector.hpp index f0bc2077..9ad0b6fd 100644 --- a/inst/include/cpp11/r_vector.hpp +++ b/inst/include/cpp11/r_vector.hpp @@ -420,7 +420,7 @@ inline r_vector& r_vector::operator=(const r_vector& rhs) { length_ = rhs.length_; return *this; -}; +} // Same reasoning as `r_vector(r_vector&& x)` constructor template @@ -446,7 +446,7 @@ inline r_vector& r_vector::operator=(r_vector&& rhs) { rhs.length_ = 0; return *this; -}; +} template inline r_vector::operator SEXP() const { diff --git a/inst/include/cpp11/raws.hpp b/inst/include/cpp11/raws.hpp index 60baf74f..f16a6e39 100644 --- a/inst/include/cpp11/raws.hpp +++ b/inst/include/cpp11/raws.hpp @@ -56,7 +56,7 @@ inline void r_vector::get_region(SEXP x, R_xlen_t i, R_xlen_t n, typename r_vector::underlying_type* buf) { // NOPROTECT: likely too costly to unwind protect here RAW_GET_REGION(x, i, n, buf); -}; +} template <> inline bool r_vector::const_iterator::use_buf(bool is_altrep) { diff --git a/inst/include/cpp11/strings.hpp b/inst/include/cpp11/strings.hpp index dabe2950..393f2a8c 100644 --- a/inst/include/cpp11/strings.hpp +++ b/inst/include/cpp11/strings.hpp @@ -49,7 +49,7 @@ template <> inline void r_vector::get_region(SEXP x, R_xlen_t i, R_xlen_t n, typename r_vector::underlying_type* buf) { cpp11::stop("Unreachable!"); -}; +} template <> inline bool r_vector::const_iterator::use_buf(bool is_altrep) {