From f16137bde7fb4fee318d5add752859b67dc24c28 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 18 Aug 2023 15:13:55 -0700 Subject: [PATCH] try making to_path return a c str to make mingw happy --- src/support/path.cpp | 2 +- src/support/path.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/support/path.cpp b/src/support/path.cpp index a09e146e236..885fecbe090 100644 --- a/src/support/path.cpp +++ b/src/support/path.cpp @@ -49,7 +49,7 @@ std::string wstring_to_string(const std::wstring& s) { return outstr; } #else -PathString to_path(const std::string& s) { return s; } +const PathString::value_type* to_path(const std::string& s) { return s.c_str(); } #endif char getPathSeparator() { diff --git a/src/support/path.h b/src/support/path.h index b0ca34a7cec..dc7d340b6ce 100644 --- a/src/support/path.h +++ b/src/support/path.h @@ -34,7 +34,7 @@ std::string wstring_to_string(const std::wstring& s); using PathString = std::string; #endif -PathString to_path(const std::string& s); +const PathString::value_type* to_path(const std::string& s); char getPathSeparator(); std::string getDirName(const std::string& path);