Do some obvious cleanup

DavisVaughan · DavisVaughan · commit dccd4f67c99f · 2024-08-09T16:06:26.000-04:00
diff --git a/inst/include/cpp11/doubles.hpp b/inst/include/cpp11/doubles.hpp
@@ -44,9 +44,8 @@ inline typename r_vector<double>::underlying_type* r_vector<double>::get_p(bool
 }
 
 template <>
-inline void r_vector<double>::get_region(
-    SEXP x, R_xlen_t i, R_xlen_t n,
-    typename traits::get_underlying_type<double>::type* buf) {
+inline void r_vector<double>::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);
 };
@@ -66,8 +65,8 @@ inline SEXPTYPE r_vector<double>::get_sexptype() {
 }
 
 template <>
-inline void r_vector<double>::set_elt(
-    SEXP x, R_xlen_t i, typename traits::get_underlying_type<double>::type value) {
+inline void r_vector<double>::set_elt(SEXP x, R_xlen_t i,
+                                      typename r_vector::underlying_type value) {
   SET_REAL_ELT(x, i, value);
 }
 
diff --git a/inst/include/cpp11/integers.hpp b/inst/include/cpp11/integers.hpp
@@ -45,9 +45,8 @@ inline typename r_vector<int>::underlying_type* r_vector<int>::get_p(bool is_alt
 }
 
 template <>
-inline void r_vector<int>::get_region(
-    SEXP x, R_xlen_t i, R_xlen_t n,
-    typename traits::get_underlying_type<int>::type* buf) {
+inline void r_vector<int>::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);
 };
@@ -67,8 +66,8 @@ inline SEXPTYPE r_vector<int>::get_sexptype() {
 }
 
 template <>
-inline void r_vector<int>::set_elt(
-    SEXP x, R_xlen_t i, typename traits::get_underlying_type<int>::type value) {
+inline void r_vector<int>::set_elt(SEXP x, R_xlen_t i,
+                                   typename r_vector::underlying_type value) {
   SET_INTEGER_ELT(x, i, value);
 }
 
diff --git a/inst/include/cpp11/list.hpp b/inst/include/cpp11/list.hpp
@@ -50,9 +50,8 @@ inline typename r_vector<SEXP>::underlying_type* r_vector<SEXP>::get_p(bool, SEX
 }
 
 template <>
-inline void r_vector<SEXP>::get_region(
-    SEXP x, R_xlen_t i, R_xlen_t n,
-    typename traits::get_underlying_type<SEXP>::type* buf) {
+inline void r_vector<SEXP>::get_region(SEXP x, R_xlen_t i, R_xlen_t n,
+                                       typename r_vector::underlying_type* buf) {
   cpp11::stop("Unreachable!");
 };
 
@@ -76,8 +75,8 @@ inline SEXPTYPE r_vector<SEXP>::get_sexptype() {
 }
 
 template <>
-inline void r_vector<SEXP>::set_elt(
-    SEXP x, R_xlen_t i, typename traits::get_underlying_type<SEXP>::type value) {
+inline void r_vector<SEXP>::set_elt(SEXP x, R_xlen_t i,
+                                    typename r_vector::underlying_type value) {
   SET_VECTOR_ELT(x, i, value);
 }
 
diff --git a/inst/include/cpp11/logicals.hpp b/inst/include/cpp11/logicals.hpp
@@ -43,9 +43,8 @@ inline typename r_vector<r_bool>::underlying_type* r_vector<r_bool>::get_p(bool
 }
 
 template <>
-inline void r_vector<r_bool>::get_region(
-    SEXP x, R_xlen_t i, R_xlen_t n,
-    typename traits::get_underlying_type<r_bool>::type* buf) {
+inline void r_vector<r_bool>::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);
 };
@@ -65,8 +64,8 @@ inline SEXPTYPE r_vector<r_bool>::get_sexptype() {
 }
 
 template <>
-inline void r_vector<r_bool>::set_elt(
-    SEXP x, R_xlen_t i, typename traits::get_underlying_type<r_bool>::type value) {
+inline void r_vector<r_bool>::set_elt(SEXP x, R_xlen_t i,
+                                      typename r_vector::underlying_type value) {
   SET_LOGICAL_ELT(x, i, value);
 }
 
diff --git a/inst/include/cpp11/raws.hpp b/inst/include/cpp11/raws.hpp
@@ -52,9 +52,8 @@ inline typename r_vector<uint8_t>::underlying_type* r_vector<uint8_t>::get_p(
 }
 
 template <>
-inline void r_vector<uint8_t>::get_region(
-    SEXP x, R_xlen_t i, R_xlen_t n,
-    typename traits::get_underlying_type<uint8_t>::type* buf) {
+inline void r_vector<uint8_t>::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);
 };
@@ -74,8 +73,8 @@ inline SEXPTYPE r_vector<uint8_t>::get_sexptype() {
 }
 
 template <>
-inline void r_vector<uint8_t>::set_elt(
-    SEXP x, R_xlen_t i, typename traits::get_underlying_type<uint8_t>::type value) {
+inline void r_vector<uint8_t>::set_elt(SEXP x, R_xlen_t i,
+                                       typename r_vector::underlying_type value) {
 #if R_VERSION >= R_Version(4, 2, 0)
   SET_RAW_ELT(x, i, value);
 #else
diff --git a/inst/include/cpp11/strings.hpp b/inst/include/cpp11/strings.hpp
@@ -40,9 +40,8 @@ inline typename r_vector<r_string>::underlying_type* r_vector<r_string>::get_p(b
 }
 
 template <>
-inline void r_vector<r_string>::get_region(
-    SEXP x, R_xlen_t i, R_xlen_t n,
-    typename traits::get_underlying_type<r_string>::type* buf) {
+inline void r_vector<r_string>::get_region(SEXP x, R_xlen_t i, R_xlen_t n,
+                                           typename r_vector::underlying_type* buf) {
   cpp11::stop("Unreachable!");
 };
 
@@ -66,8 +65,8 @@ inline SEXPTYPE r_vector<r_string>::get_sexptype() {
 }
 
 template <>
-inline void r_vector<r_string>::set_elt(
-    SEXP x, R_xlen_t i, typename traits::get_underlying_type<r_string>::type value) {
+inline void r_vector<r_string>::set_elt(SEXP x, R_xlen_t i,
+                                        typename r_vector::underlying_type value) {
   SET_STRING_ELT(x, i, value);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,8 @@ inline typename r_vector<double>::underlying_type* r_vector<double>::get_p(bool`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`template <>`
`47`		`-inline void r_vector<double>::get_region(`
`48`		`- SEXP x, R_xlen_t i, R_xlen_t n,`
`49`		`- typename traits::get_underlying_type<double>::type* buf) {`
	`47`	`+inline void r_vector<double>::get_region(SEXP x, R_xlen_t i, R_xlen_t n,`
	`48`	`+ typename r_vector::underlying_type* buf) {`
`50`	`49`	`// NOPROTECT: likely too costly to unwind protect here`
`51`	`50`	`REAL_GET_REGION(x, i, n, buf);`
`52`	`51`	`};`
`@@ -66,8 +65,8 @@ inline SEXPTYPE r_vector<double>::get_sexptype() {`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`template <>`
`69`		`-inline void r_vector<double>::set_elt(`
`70`		`- SEXP x, R_xlen_t i, typename traits::get_underlying_type<double>::type value) {`
	`68`	`+inline void r_vector<double>::set_elt(SEXP x, R_xlen_t i,`
	`69`	`+ typename r_vector::underlying_type value) {`
`71`	`70`	`SET_REAL_ELT(x, i, value);`
`72`	`71`	`}`
`73`	`72`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,8 @@ inline typename r_vector<int>::underlying_type* r_vector<int>::get_p(bool is_alt`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`template <>`
`48`		`-inline void r_vector<int>::get_region(`
`49`		`- SEXP x, R_xlen_t i, R_xlen_t n,`
`50`		`- typename traits::get_underlying_type<int>::type* buf) {`
	`48`	`+inline void r_vector<int>::get_region(SEXP x, R_xlen_t i, R_xlen_t n,`
	`49`	`+ typename r_vector::underlying_type* buf) {`
`51`	`50`	`// NOPROTECT: likely too costly to unwind protect here`
`52`	`51`	`INTEGER_GET_REGION(x, i, n, buf);`
`53`	`52`	`};`
`@@ -67,8 +66,8 @@ inline SEXPTYPE r_vector<int>::get_sexptype() {`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`template <>`
`70`		`-inline void r_vector<int>::set_elt(`
`71`		`- SEXP x, R_xlen_t i, typename traits::get_underlying_type<int>::type value) {`
	`69`	`+inline void r_vector<int>::set_elt(SEXP x, R_xlen_t i,`
	`70`	`+ typename r_vector::underlying_type value) {`
`72`	`71`	`SET_INTEGER_ELT(x, i, value);`
`73`	`72`	`}`
`74`	`73`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,8 @@ inline typename r_vector<SEXP>::underlying_type* r_vector<SEXP>::get_p(bool, SEX`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`template <>`
`53`		`-inline void r_vector<SEXP>::get_region(`
`54`		`- SEXP x, R_xlen_t i, R_xlen_t n,`
`55`		`- typename traits::get_underlying_type<SEXP>::type* buf) {`
	`53`	`+inline void r_vector<SEXP>::get_region(SEXP x, R_xlen_t i, R_xlen_t n,`
	`54`	`+ typename r_vector::underlying_type* buf) {`
`56`	`55`	`cpp11::stop("Unreachable!");`
`57`	`56`	`};`
`58`	`57`
`@@ -76,8 +75,8 @@ inline SEXPTYPE r_vector<SEXP>::get_sexptype() {`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`template <>`
`79`		`-inline void r_vector<SEXP>::set_elt(`
`80`		`- SEXP x, R_xlen_t i, typename traits::get_underlying_type<SEXP>::type value) {`
	`78`	`+inline void r_vector<SEXP>::set_elt(SEXP x, R_xlen_t i,`
	`79`	`+ typename r_vector::underlying_type value) {`
`81`	`80`	`SET_VECTOR_ELT(x, i, value);`
`82`	`81`	`}`
`83`	`82`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,8 @@ inline typename r_vector<r_bool>::underlying_type* r_vector<r_bool>::get_p(bool`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`template <>`
`46`		`-inline void r_vector<r_bool>::get_region(`
`47`		`- SEXP x, R_xlen_t i, R_xlen_t n,`
`48`		`- typename traits::get_underlying_type<r_bool>::type* buf) {`
	`46`	`+inline void r_vector<r_bool>::get_region(SEXP x, R_xlen_t i, R_xlen_t n,`
	`47`	`+ typename r_vector::underlying_type* buf) {`
`49`	`48`	`// NOPROTECT: likely too costly to unwind protect here`
`50`	`49`	`LOGICAL_GET_REGION(x, i, n, buf);`
`51`	`50`	`};`
`@@ -65,8 +64,8 @@ inline SEXPTYPE r_vector<r_bool>::get_sexptype() {`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`template <>`
`68`		`-inline void r_vector<r_bool>::set_elt(`
`69`		`- SEXP x, R_xlen_t i, typename traits::get_underlying_type<r_bool>::type value) {`
	`67`	`+inline void r_vector<r_bool>::set_elt(SEXP x, R_xlen_t i,`
	`68`	`+ typename r_vector::underlying_type value) {`
`70`	`69`	`SET_LOGICAL_ELT(x, i, value);`
`71`	`70`	`}`
`72`	`71`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,8 @@ inline typename r_vector<r_string>::underlying_type* r_vector<r_string>::get_p(b`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`template <>`
`43`		`-inline void r_vector<r_string>::get_region(`
`44`		`- SEXP x, R_xlen_t i, R_xlen_t n,`
`45`		`- typename traits::get_underlying_type<r_string>::type* buf) {`
	`43`	`+inline void r_vector<r_string>::get_region(SEXP x, R_xlen_t i, R_xlen_t n,`
	`44`	`+ typename r_vector::underlying_type* buf) {`
`46`	`45`	`cpp11::stop("Unreachable!");`
`47`	`46`	`};`
`48`	`47`
`@@ -66,8 +65,8 @@ inline SEXPTYPE r_vector<r_string>::get_sexptype() {`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`template <>`
`69`		`-inline void r_vector<r_string>::set_elt(`
`70`		`- SEXP x, R_xlen_t i, typename traits::get_underlying_type<r_string>::type value) {`
	`68`	`+inline void r_vector<r_string>::set_elt(SEXP x, R_xlen_t i,`
	`69`	`+ typename r_vector::underlying_type value) {`
`71`	`70`	`SET_STRING_ELT(x, i, value);`
`72`	`71`	`}`
`73`	`72`