Skip to content

chore: move to C++20 #291

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: move to C++20 #291

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/nyx/output_2_csv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ namespace Nyxus

// other columns
std::vector<std::string> 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 #

Expand Down Expand Up @@ -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<std::string> 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)
{
Expand Down
Loading