Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove macros for unordered maps/sets #1372

Merged
merged 4 commits into from
Mar 28, 2025
Merged

Remove macros for unordered maps/sets #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f78e46
remove macros for unordered maps/sets
Enchufa2 Mar 24, 2025
47db39e
do not deprecate yet
Enchufa2 Mar 24, 2025
dca5edb
update Changelog
Enchufa2 Mar 26, 2025
71b01bb
Roll micro version and date
eddelbuettel Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
2025-03-26 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version and date
* inst/include/Rcpp/config.h: Idem

2025-03-26 Iñaki Ucar <[email protected]>

* inst/include/Rcpp/platform/compiler.h: Remove definitions of
RCPP_USING_UNORDERED_MAP and RCPP_USING_UNORDERED_SET
* inst/include/Rcpp/sugar/sets.h: Remove redefinition of macros
* inst/include/Rcpp/sugar/functions/self_match.h: Replace macros with
std::unordered_map and std::unordered_set respectively
* inst/include/Rcpp/sugar/functions/setdiff.h: Idem
* inst/include/Rcpp/sugar/functions/table.h: Idem
* inst/tinytest/cpp/wrap.cpp: Idem

2025-03-24 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version and date
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.0.14.10
Date: 2025-03-24
Version: 1.0.14.11
Date: 2025-03-26
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
comment = c(ORCID = "0000-0001-6419-907X")),
person("Romain", "Francois", role = "aut",
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.14"

// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
#define RCPP_DEV_VERSION RcppDevVersion(1,0,14,10)
#define RCPP_DEV_VERSION_STRING "1.0.14.10"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,14,11)
#define RCPP_DEV_VERSION_STRING "1.0.14.11"

#endif
7 changes: 3 additions & 4 deletions inst/include/Rcpp/platform/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// compiler.h: Rcpp R/C++ interface class library -- check compiler
//
// Copyright (C) 2012 - 2025 Dirk Eddelbuettel, Romain Francois, and Kevin Ushey
// Copyright (C) 2025 Dirk Eddelbuettel, Romain Francois, Kevin Ushey and Iñaki Ucar
//
// This file is part of Rcpp.
//
Expand Down Expand Up @@ -36,11 +37,9 @@
#include <cmath>
#include <initializer_list>
#include <unordered_map>
#define RCPP_USING_UNORDERED_MAP
#define RCPP_UNORDERED_MAP std::unordered_map
#define RCPP_UNORDERED_MAP std::unordered_map // TODO deprecate
#include <unordered_set>
#define RCPP_USING_UNORDERED_SET
#define RCPP_UNORDERED_SET std::unordered_set
#define RCPP_UNORDERED_SET std::unordered_set // TODO deprecate

#if defined(__GNUC__)
#define RCPP_HAS_DEMANGLING
Expand Down
5 changes: 3 additions & 2 deletions inst/include/Rcpp/sugar/functions/self_match.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
//
// self_match.h: Rcpp R/C++ interface class library -- self match
//
// Copyright (C) 2012 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2012 - 2024 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2025 Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
//
// This file is part of Rcpp.
//
Expand Down Expand Up @@ -57,7 +58,7 @@ class SelfMatch {
inline operator IntegerVector() const { return result ; }

private:
typedef RCPP_UNORDERED_MAP<STORAGE, int> HASH ;
typedef std::unordered_map<STORAGE, int> HASH ;
typedef SelfInserter<HASH,STORAGE> Inserter ;
HASH hash ;
IntegerVector result ;
Expand Down
11 changes: 6 additions & 5 deletions inst/include/Rcpp/sugar/functions/setdiff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
//
// setdiff.h: Rcpp R/C++ interface class library -- setdiff
//
// Copyright (C) 2012 - 2014 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2012 - 2024 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2025 Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
//
// This file is part of Rcpp.
//
Expand Down Expand Up @@ -60,7 +61,7 @@ namespace sugar{
}

private:
typedef RCPP_UNORDERED_SET<STORAGE> SET ;
typedef std::unordered_set<STORAGE> SET ;
typedef typename SET::const_iterator ITERATOR ;
SET lhs_set ;
SET rhs_set ;
Expand Down Expand Up @@ -89,7 +90,7 @@ namespace sugar{
}

private:
typedef RCPP_UNORDERED_SET<STORAGE> SET ;
typedef std::unordered_set<STORAGE> SET ;
typedef typename SET::const_iterator ITERATOR ;
SET lhs_set ;
SET rhs_set ;
Expand Down Expand Up @@ -123,7 +124,7 @@ namespace sugar{
}

private:
typedef RCPP_UNORDERED_SET<STORAGE> SET ;
typedef std::unordered_set<STORAGE> SET ;
typedef typename SET::const_iterator ITERATOR ;
SET intersect ;

Expand All @@ -148,7 +149,7 @@ namespace sugar{
}

private:
typedef RCPP_UNORDERED_SET<STORAGE> SET ;
typedef std::unordered_set<STORAGE> SET ;
typedef typename SET::const_iterator ITERATOR ;
SET result ;

Expand Down
3 changes: 2 additions & 1 deletion inst/include/Rcpp/sugar/functions/table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// table.h: Rcpp R/C++ interface class library -- table match
//
// Copyright (C) 2012 - 2025 Dirk Eddelbuettel, Romain Francois, and Kevin Ushey
// Copyright (C) 2025 Dirk Eddelbuettel, Romain Francois, Kevin Ushey and Iñaki Ucar
//
// This file is part of Rcpp.
//
Expand Down Expand Up @@ -77,7 +78,7 @@ class Table {
}

private:
typedef RCPP_UNORDERED_MAP<STORAGE, int> HASH ;
typedef std::unordered_map<STORAGE, int> HASH ;
typedef CountInserter<HASH,STORAGE> Inserter ;
HASH hash ;

Expand Down
3 changes: 0 additions & 3 deletions inst/include/Rcpp/sugar/sets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
#ifndef Rcpp__sugar__sets_h
#define Rcpp__sugar__sets_h

#define RCPP_UNORDERED_SET std::unordered_set
#define RCPP_UNORDERED_MAP std::unordered_map

namespace std {
template<>
struct hash<Rcpp::String> {
Expand Down
17 changes: 9 additions & 8 deletions inst/tinytest/cpp/wrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// wrap.cpp: Rcpp R/C++ interface class library -- wrap unit tests
//
// Copyright (C) 2013 - 2025 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2025 Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
//
// This file is part of Rcpp.
//
Expand Down Expand Up @@ -170,7 +171,7 @@ SEXP nonnull_const_char(){

// [[Rcpp::export]]
IntegerVector unordered_map_string_int(){
RCPP_UNORDERED_MAP< std::string, int > m ;
std::unordered_map< std::string, int > m ;
m["b"] = 100;
m["a"] = 200;
m["c"] = 300;
Expand All @@ -179,7 +180,7 @@ IntegerVector unordered_map_string_int(){

// [[Rcpp::export]]
IntegerVector unordered_map_rcpp_string_int(StringVector v){
RCPP_UNORDERED_MAP< String, int > m ;
std::unordered_map< String, int > m ;
m[v[0]] = 200;
m[v[1]] = 100;
m[v[2]] = 300;
Expand All @@ -188,7 +189,7 @@ IntegerVector unordered_map_rcpp_string_int(StringVector v){

// [[Rcpp::export]]
LogicalVector unordered_set_rcpp_string(StringVector x) {
RCPP_UNORDERED_SET<String> seen;
std::unordered_set<String> seen;
LogicalVector out(x.size());
for (int i = 0; i < x.size(); i++) {
out[i] = !seen.insert(x[i]).second;
Expand All @@ -198,7 +199,7 @@ LogicalVector unordered_set_rcpp_string(StringVector x) {

// [[Rcpp::export]]
NumericVector unordered_map_string_double(){
RCPP_UNORDERED_MAP<std::string,double> m ;
std::unordered_map<std::string,double> m ;
m["b"] = 100;
m["a"] = 200;
m["c"] = 300;
Expand All @@ -207,7 +208,7 @@ NumericVector unordered_map_string_double(){

// [[Rcpp::export]]
LogicalVector unordered_map_string_bool(){
RCPP_UNORDERED_MAP<std::string,bool> m ;
std::unordered_map<std::string,bool> m ;
m["b"] = true;
m["a"] = false;
m["c"] = true;
Expand All @@ -216,7 +217,7 @@ LogicalVector unordered_map_string_bool(){

// [[Rcpp::export]]
RawVector unordered_map_string_Rbyte(){
RCPP_UNORDERED_MAP<std::string,Rbyte> m ;
std::unordered_map<std::string,Rbyte> m ;
m["b"] = (Rbyte)0;
m["a"] = (Rbyte)1;
m["c"] = (Rbyte)2;
Expand All @@ -225,7 +226,7 @@ RawVector unordered_map_string_Rbyte(){

// [[Rcpp::export]]
CharacterVector unordered_map_string_string(){
RCPP_UNORDERED_MAP<std::string,std::string> m ;
std::unordered_map<std::string,std::string> m ;
m["b"] = "foo" ;
m["a"] = "bar" ;
m["c"] = "bling" ;
Expand All @@ -234,7 +235,7 @@ CharacterVector unordered_map_string_string(){

// [[Rcpp::export]]
List unordered_map_string_generic(){
RCPP_UNORDERED_MAP< std::string,std::vector<int> > m ;
std::unordered_map< std::string,std::vector<int> > m ;
std::vector<int> b; b.push_back(1); b.push_back(2); m["b"] = b ;
std::vector<int> a; a.push_back(1); a.push_back(2); a.push_back(2); m["a"] = a;
std::vector<int> c; c.push_back(1); c.push_back(2); c.push_back(2); c.push_back(2); m["c"] = c;
Expand Down