From eaa5d164c0a3b95a872ef7354cc59f86aeb38ceb Mon Sep 17 00:00:00 2001 From: Jan Marvin Garbuszus Date: Sun, 12 Nov 2023 23:42:31 +0100 Subject: [PATCH] [cpp] attempt to fix wasm build --- src/helper_functions.cpp | 2 +- src/load_workbook.cpp | 6 +++--- src/styles_xml.cpp | 32 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/helper_functions.cpp b/src/helper_functions.cpp index aae7abfbd..6b18a452b 100644 --- a/src/helper_functions.cpp +++ b/src/helper_functions.cpp @@ -215,7 +215,7 @@ SEXP rbindlist(Rcpp::List x) { for (size_t j = 0; j < names.size(); ++j) { auto find_res = unique_names.find(names[j]); - auto mtc = std::distance(unique_names.begin(), find_res); + R_xlen_t mtc = std::distance(unique_names.begin(), find_res); Rcpp::as(df[mtc])[i] = Rcpp::String(values[j]); } diff --git a/src/load_workbook.cpp b/src/load_workbook.cpp index 7e7eaf59f..117fce566 100644 --- a/src/load_workbook.cpp +++ b/src/load_workbook.cpp @@ -43,7 +43,7 @@ Rcpp::DataFrame col_to_df(XPtrXML doc) { if (col_nams.count(attr_name) == 0) { Rcpp::Rcout << attr_name << ": not found in col name table" << std::endl; } else { - auto mtc = std::distance(col_nams.begin(), find_res); + R_xlen_t mtc = std::distance(col_nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = attr_value; } @@ -147,7 +147,7 @@ Rcpp::DataFrame row_to_df(XPtrXML doc) { if (row_nams.count(attr_name) == 0) { Rcpp::Rcout << attr_name << ": not found in row name table" << std::endl; } else { - auto mtc = std::distance(row_nams.begin(), find_res); + R_xlen_t mtc = std::distance(row_nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = attr_value; if (attr_name == "r") has_rowname = true; } @@ -158,7 +158,7 @@ Rcpp::DataFrame row_to_df(XPtrXML doc) { if (!has_rowname) { std::string attr_name = "r"; auto find_res = row_nams.find(attr_name); - auto mtc = std::distance(row_nams.begin(), find_res); + R_xlen_t mtc = std::distance(row_nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = std::to_string(itr + 1); } diff --git a/src/styles_xml.cpp b/src/styles_xml.cpp index b72ddaeca..a74af4792 100644 --- a/src/styles_xml.cpp +++ b/src/styles_xml.cpp @@ -24,7 +24,7 @@ bool has_it(Rcpp::DataFrame df_xf, std::set xf_nams, size_t row) { std::string xf_name = xf_names[i]; if (df_names.count(xf_name) > 0) { auto res = df_names.find(xf_name); - auto mtc = std::distance(df_names.begin(), res); + R_xlen_t mtc = std::distance(df_names.begin(), res); idx.push_back(mtc); } } @@ -112,7 +112,7 @@ Rcpp::DataFrame read_xf(XPtrXML xml_doc_xf) { if (nams.count(attr_name) == 0) { Rcpp::warning("%s: not found in xf name table", attr_name); } else { - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = attr_value; } } @@ -137,7 +137,7 @@ Rcpp::DataFrame read_xf(XPtrXML xml_doc_xf) { if (nams.count(attr_name) == 0) { Rcpp::warning("%s: not found in xf name table", attr_name); } else { - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = attr_value; } } @@ -364,7 +364,7 @@ Rcpp::DataFrame read_font(XPtrXML xml_doc_font) { std::ostringstream oss; cld.print(oss, " ", pugi_format_flags); - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = oss.str(); } @@ -465,7 +465,7 @@ Rcpp::DataFrame read_numfmt(XPtrXML xml_doc_numfmt) { if (nams.count(attr_name) == 0) { Rcpp::warning("%s: not found in numfmt name table", attr_name); } else { - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = attr_value; } } @@ -568,7 +568,7 @@ Rcpp::DataFrame read_border(XPtrXML xml_doc_border) { if (nams.count(attr_name) == 0) { Rcpp::warning("%s: not found in border name table", attr_name); } else { - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = attr_value; } } @@ -586,7 +586,7 @@ Rcpp::DataFrame read_border(XPtrXML xml_doc_border) { cld.print(oss, " ", pugi_format_flags); std::string cld_value = oss.str(); - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = cld_value; } } @@ -632,13 +632,13 @@ Rcpp::CharacterVector write_border(Rcpp::DataFrame df_border) { // mimic which auto res1 = nam_attrs.find(attr_j); - auto mtc1 = std::distance(nam_attrs.begin(), res1); + R_xlen_t mtc1 = std::distance(nam_attrs.begin(), res1); std::vector idx1(mtc1 + 1); std::iota(idx1.begin(), idx1.end(), 0); auto res2 = nam_chlds.find(attr_j); - auto mtc2 = std::distance(nam_chlds.begin(), res2); + R_xlen_t mtc2 = std::distance(nam_chlds.begin(), res2); std::vector idx2(mtc2 + 1); std::iota(idx2.begin(), idx2.end(), 0); @@ -728,7 +728,7 @@ Rcpp::DataFrame read_fill(XPtrXML xml_doc_fill) { std::ostringstream oss; cld.print(oss, " ", pugi_format_flags); - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = oss.str(); } @@ -840,7 +840,7 @@ Rcpp::DataFrame read_cellStyle(XPtrXML xml_doc_cellStyle) { if (nams.count(attr_name) == 0) { Rcpp::warning("%s: not found in cellstyle name table", attr_name); } else { - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = attr_value; } } @@ -858,7 +858,7 @@ Rcpp::DataFrame read_cellStyle(XPtrXML xml_doc_cellStyle) { cld.print(oss, " ", pugi_format_flags); std::string cld_value = oss.str(); - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = cld_value; } } @@ -1006,7 +1006,7 @@ Rcpp::DataFrame read_tableStyle(XPtrXML xml_doc_tableStyle) { if (nams.count(attr_name) == 0) { Rcpp::warning("%s: not found in tablestyle name table", attr_name); } else { - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = attr_value; } } @@ -1025,7 +1025,7 @@ Rcpp::DataFrame read_tableStyle(XPtrXML xml_doc_tableStyle) { cld.print(oss, " ", pugi_format_flags); cld_value += oss.str(); - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = cld_value; } } @@ -1174,7 +1174,7 @@ Rcpp::DataFrame read_dxf(XPtrXML xml_doc_dxf) { cld.print(oss, " ", pugi_format_flags); std::string value = oss.str(); - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = value; } @@ -1281,7 +1281,7 @@ Rcpp::DataFrame read_colors(XPtrXML xml_doc_colors) { cld.print(oss, " ", pugi_format_flags); std::string cld_value = oss.str(); - auto mtc = std::distance(nams.begin(), find_res); + R_xlen_t mtc = std::distance(nams.begin(), find_res); Rcpp::as(df[mtc])[itr] = cld_value; }