Public/koboldcpp
1
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-08-30 09:00:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '456af35eb70177b8dd5779b6d4c21bb020f9cebd' into concedo_experimental

Browse Source 
# Conflicts:
#	ggml/src/ggml-sycl/getrows.cpp
#	src/CMakeLists.txt
#	tools/llama-bench/llama-bench.cpp
This commit is contained in:
Concedo
2025-06-20 23:41:27 +08:00
parent 0ad95e8ea2 456af35eb7
commit b59b5dbbd1
28 changed files with 1403 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/unicode.cpp
+5
View File
@@ -205,11 +205,16 @@ static inline std::wstring unicode_wstring_from_utf8(const std::string & s) {
// disable C++17 deprecation warning for std::codecvt_utf8
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
#elif defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
#if defined(__clang__)
# pragma clang diagnostic pop
#elif defined(__GNUC__)
# pragma GCC diagnostic pop
#endif
try {
return conv.from_bytes(s);