remove changes made in other PRs

Author: pachadotdev

cpp11test/R/cpp11.R

@@ -88,18 +88,6 @@ cpp11_insert_ <- function(num_sxp) {
   .Call(`_cpp11test_cpp11_insert_`, num_sxp)
 }
 
-ordered_map_to_list_ <- function(x) {
-  .Call(`_cpp11test_ordered_map_to_list_`, x)
-}
-
-ordered_map_to_list_2_ <- function(x) {
-  .Call(`_cpp11test_ordered_map_to_list_2_`, x)
-}
-
-unordered_map_to_list_ <- function(x) {
-  .Call(`_cpp11test_unordered_map_to_list_`, x)
-}
-
 gibbs_cpp <- function(N, thin) {
   .Call(`_cpp11test_gibbs_cpp`, N, thin)
 }

cpp11test/src/cpp11.cpp

@@ -173,27 +173,6 @@ extern "C" SEXP _cpp11test_cpp11_insert_(SEXP num_sxp) {
     return cpp11::as_sexp(cpp11_insert_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(num_sxp)));
   END_CPP11
 }
-// map.cpp
-SEXP ordered_map_to_list_(cpp11::doubles x);
-extern "C" SEXP _cpp11test_ordered_map_to_list_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(ordered_map_to_list_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
-  END_CPP11
-}
-// map.cpp
-SEXP ordered_map_to_list_2_(cpp11::doubles x);
-extern "C" SEXP _cpp11test_ordered_map_to_list_2_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(ordered_map_to_list_2_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
-  END_CPP11
-}
-// map.cpp
-SEXP unordered_map_to_list_(cpp11::doubles x);
-extern "C" SEXP _cpp11test_unordered_map_to_list_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(unordered_map_to_list_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
-  END_CPP11
-}
 // matrix.cpp
 SEXP gibbs_cpp(int N, int thin);
 extern "C" SEXP _cpp11test_gibbs_cpp(SEXP N, SEXP thin) {
@@ -630,12 +609,12 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11test_gibbs_rcpp",               (DL_FUNC) &_cpp11test_gibbs_rcpp,               2},
     {"_cpp11test_gibbs_rcpp2",              (DL_FUNC) &_cpp11test_gibbs_rcpp2,              2},
     {"_cpp11test_grow_",                    (DL_FUNC) &_cpp11test_grow_,                    1},
-    {"_cpp11test_mat_mat_copy_dimnames",    (DL_FUNC) &_cpp11test_mat_mat_copy_dimnames,    1},
-    {"_cpp11test_mat_mat_create_dimnames",  (DL_FUNC) &_cpp11test_mat_mat_create_dimnames,  0},
-    {"_cpp11test_mat_sexp_copy_dimnames",   (DL_FUNC) &_cpp11test_mat_sexp_copy_dimnames,   1},
     {"_cpp11test_grow_strings_cpp11_",      (DL_FUNC) &_cpp11test_grow_strings_cpp11_,      2},
     {"_cpp11test_grow_strings_manual_",     (DL_FUNC) &_cpp11test_grow_strings_manual_,     2},
     {"_cpp11test_grow_strings_rcpp_",       (DL_FUNC) &_cpp11test_grow_strings_rcpp_,       2},
+    {"_cpp11test_mat_mat_copy_dimnames",    (DL_FUNC) &_cpp11test_mat_mat_copy_dimnames,    1},
+    {"_cpp11test_mat_mat_create_dimnames",  (DL_FUNC) &_cpp11test_mat_mat_create_dimnames,  0},
+    {"_cpp11test_mat_sexp_copy_dimnames",   (DL_FUNC) &_cpp11test_mat_sexp_copy_dimnames,   1},
     {"_cpp11test_my_message",               (DL_FUNC) &_cpp11test_my_message,               2},
     {"_cpp11test_my_message_n1",            (DL_FUNC) &_cpp11test_my_message_n1,            1},
     {"_cpp11test_my_message_n1fmt",         (DL_FUNC) &_cpp11test_my_message_n1fmt,         1},
@@ -648,8 +627,8 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11test_my_warning_n1",            (DL_FUNC) &_cpp11test_my_warning_n1,            1},
     {"_cpp11test_my_warning_n1fmt",         (DL_FUNC) &_cpp11test_my_warning_n1fmt,         1},
     {"_cpp11test_my_warning_n2fmt",         (DL_FUNC) &_cpp11test_my_warning_n2fmt,         2},
-    {"_cpp11test_ordered_map_to_list_",     (DL_FUNC) &_cpp11test_ordered_map_to_list_,     1},
-    {"_cpp11test_ordered_map_to_list_2_",   (DL_FUNC) &_cpp11test_ordered_map_to_list_2_,   1},
+    {"_cpp11test_notroxcpp1_",              (DL_FUNC) &_cpp11test_notroxcpp1_,              1},
+    {"_cpp11test_notroxcpp6_",              (DL_FUNC) &_cpp11test_notroxcpp6_,              1},
     {"_cpp11test_nullable_extptr_1",        (DL_FUNC) &_cpp11test_nullable_extptr_1,        0},
     {"_cpp11test_nullable_extptr_2",        (DL_FUNC) &_cpp11test_nullable_extptr_2,        0},
     {"_cpp11test_protect_many_",            (DL_FUNC) &_cpp11test_protect_many_,            1},
@@ -690,7 +669,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11test_sum_int_foreach_",         (DL_FUNC) &_cpp11test_sum_int_foreach_,         1},
     {"_cpp11test_test_destruction_inner",   (DL_FUNC) &_cpp11test_test_destruction_inner,   0},
     {"_cpp11test_test_destruction_outer",   (DL_FUNC) &_cpp11test_test_destruction_outer,   0},
-    {"_cpp11test_unordered_map_to_list_",   (DL_FUNC) &_cpp11test_unordered_map_to_list_,   1},
     {"_cpp11test_upper_bound",              (DL_FUNC) &_cpp11test_upper_bound,              2},
     {"run_testthat_tests",                  (DL_FUNC) &run_testthat_tests,                  1},
     {NULL, NULL, 0}

cpp11test/src/map.cpp

@@ -455,22 +455,6 @@ context("doubles-C++") {
     expect_true(!cpp11::is_na(na2[1]));
   }
 
-  test_that("as_doubles(logicals)") {
-    cpp11::writable::logicals y;
-
-    for (int i = 0; i < 4; i++) {
-      y.push_back(i % 2 == 0);
-    }
-
-    cpp11::doubles i(cpp11::as_doubles(y));
-
-    expect_true(i[0] == 1.0);
-    expect_true(i[1] == 0.0);
-    expect_true(i[2] == 1.0);
-    expect_true(i[3] == 0.0);
-    expect_true(cpp11::detail::r_typeof(i) == REALSXP);
-  }
-
   test_that("doubles operator[] and at") {
     cpp11::doubles x(Rf_allocVector(REALSXP, 2));
     REAL(x)[0] = 1;

cpp11test/src/test-doubles.cpp

@@ -44,22 +44,6 @@ context("integers-C++") {
     expect_true(!cpp11::is_na(na2[1]));
   }
 
-  test_that("as_integers(logicals)") {
-    cpp11::writable::logicals y;
-
-    for (int i = 0; i < 4; i++) {
-      y.push_back(i % 2 == 0);
-    }
-
-    cpp11::integers i(cpp11::as_integers(y));
-
-    expect_true(i[0] == 1);
-    expect_true(i[1] == 0);
-    expect_true(i[2] == 1);
-    expect_true(i[3] == 0);
-    expect_true(cpp11::detail::r_typeof(i) == INTSXP);
-  }
-
   test_that("integers.push_back()") {
     cpp11::writable::integers x;
     x.push_back(1);