From: Jason C.H <redacted>
Date: Sat, 8 Mar 2025 16:02:39 +0000 (+0800)
Subject: ggml-backend : make path_str compatible with C++20 (llama/12269)
X-Git-Tag: upstream/0.0.1898~87
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=8ae23b4fe9e2723afa3d8467e1545f97396a19d6;p=pkg%2Fggml%2Fsources%2Fggml

ggml-backend : make path_str compatible with C++20 (llama/12269)
---

diff --git a/src/ggml-backend-reg.cpp b/src/ggml-backend-reg.cpp
index d0d68bec..9bedeae7 100644
--- a/src/ggml-backend-reg.cpp
+++ b/src/ggml-backend-reg.cpp
@@ -76,7 +76,14 @@ namespace fs = std::filesystem;
 static std::string path_str(const fs::path & path) {
     std::string u8path;
     try {
+#if defined(__cpp_lib_char8_t)
+        // C++20 and later: u8string() returns std::u8string
+        std::u8string u8str = path.u8string();
+        u8path = std::string(reinterpret_cast<const char*>(u8str.c_str()));
+#else
+        // C++17: u8string() returns std::string
         u8path = path.u8string();
+#endif
     } catch (...) {
     }
     return u8path;