Skip to content

Pass string insted of const char* to regex constructor #811

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

Merged
XanthosXanthopoulos merged 1 commit into from
Apr 4, 2025
Merged

Pass string insted of const char* to regex constructor #811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/shmem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ XPtr<query_buf_t> querybuf_from_shmem(std::string path, std::string dtype) {
<< " vecsize:" << buf->size * buf->ncells;

std::string validitypath =
std::regex_replace(path, std::regex("/data/"), "/validity/");
std::regex_replace(path, std::regex(std::string("/data/")), "/validity/");
if (std::filesystem::is_regular_file(validitypath)) {
if (debug)
Rcpp::Rcout << " seeing " << validitypath;
Expand All @@ -216,8 +216,8 @@ XPtr<vlc_buf_t> vlcbuf_from_shmem(std::string datapath, std::string dtype) {
// allocate buffer, then set up buffer
XPtr<vlc_buf_t> buf = make_xptr<vlc_buf_t>(new vlc_buf_t);
read_string(datapath, buf->str);
std::string offsetspath =
std::regex_replace(datapath, std::regex("/data/"), "/offsets/");
std::string offsetspath = std::regex_replace(
datapath, std::regex(std::string("/data/")), "/offsets/");
read_buffer<uint64_t>(offsetspath, buf->offsets);
buf->rows = buf->offsets.size();
buf->cols = 2; // value not used
Expand All @@ -228,8 +228,8 @@ XPtr<vlc_buf_t> vlcbuf_from_shmem(std::string datapath, std::string dtype) {
Rcpp::Rcout << datapath << " " << offsetspath << " data:" << buf->str.size()
<< " offsets:" << buf->offsets.size();

std::string validitypath =
std::regex_replace(datapath, std::regex("/data/"), "/validity/");
std::string validitypath = std::regex_replace(
datapath, std::regex(std::string("/data/")), "/validity/");
if (std::filesystem::is_regular_file(validitypath)) {
if (debug)
Rcpp::Rcout << " validity: " << validitypath;
Expand Down
Loading