diff --git a/CMakeLists.txt b/CMakeLists.txt index f218a82a..9da77e67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ if(USEGPU) endif() #==== Compiler Options -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) if(USEGPU) diff --git a/src/nyx/output_2_csv.cpp b/src/nyx/output_2_csv.cpp index ebbbe196..395f5aea 100644 --- a/src/nyx/output_2_csv.cpp +++ b/src/nyx/output_2_csv.cpp @@ -828,7 +828,7 @@ namespace Nyxus // other columns std::vector textcols; - textcols.push_back ((fs::path(ifpath)).filename().u8string()); + textcols.push_back ((fs::path(ifpath)).filename().string()); textcols.push_back (""); int roilabl = r.label; // whole-slide roi # @@ -862,8 +862,8 @@ namespace Nyxus // Tear off pure file names from segment and intensity file paths fs::path pseg(r.segFname), pint(r.intFname); std::vector filenames; - filenames.push_back(pint.filename().u8string()); - filenames.push_back(pseg.filename().u8string()); + filenames.push_back(pint.filename().string()); + filenames.push_back(pseg.filename().string()); for (auto& enabdF : F) {