chore: suppress more warnings on Windows

vansangpfiev · vansangpfiev · commit 386c480edf3a · 2025-03-24T14:51:01.000+07:00
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -4,22 +4,9 @@ project(cortex-server C CXX)
 
 include(CheckIncludeFileCXX)
 
-check_include_file_cxx(any HAS_ANY)
-check_include_file_cxx(string_view HAS_STRING_VIEW)
-check_include_file_cxx(coroutine HAS_COROUTINE)
-if(HAS_ANY
-   AND HAS_STRING_VIEW
-   AND HAS_COROUTINE)
-  set(CMAKE_CXX_STANDARD 20)
-elseif(HAS_ANY AND HAS_STRING_VIEW)
-  set(CMAKE_CXX_STANDARD 17)
-else()
-  set(CMAKE_CXX_STANDARD 14)
-endif()
-
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(OPENSSL_USE_STATIC_LIBS TRUE)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Add CORTEX_CQA option
diff --git a/engine/cli/CMakeLists.txt b/engine/cli/CMakeLists.txt
@@ -2,22 +2,9 @@ project(cortex C CXX)
 
 include(CheckIncludeFileCXX)
 
-check_include_file_cxx(any HAS_ANY)
-check_include_file_cxx(string_view HAS_STRING_VIEW)
-check_include_file_cxx(coroutine HAS_COROUTINE)
-if(HAS_ANY
-   AND HAS_STRING_VIEW
-   AND HAS_COROUTINE)
-  set(CMAKE_CXX_STANDARD 20)
-elseif(HAS_ANY AND HAS_STRING_VIEW)
-  set(CMAKE_CXX_STANDARD 17)
-else()
-  set(CMAKE_CXX_STANDARD 14)
-endif()
-
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(OPENSSL_USE_STATIC_LIBS TRUE)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if(MSVC)
diff --git a/engine/cli/commands/engine_update_cmd.cc b/engine/cli/commands/engine_update_cmd.cc
@@ -45,7 +45,7 @@ bool EngineUpdateCmd::Exec(const std::string& host, int port,
     try {
       Json::Value json = json_helper::ParseJsonString(update_result.error());
       std::cout << json["message"].asString() << std::endl;
-    } catch (const std::exception& e) {
+    } catch (const std::exception&) {
       CTL_ERR(update_result.error());
     }
 
diff --git a/engine/config/gguf_parser.cc b/engine/config/gguf_parser.cc
@@ -86,7 +86,7 @@ void GGUFHandler::OpenFile(const std::string& file_path) {
 #endif
 }
 
-void GGUFHandler::CheckOffset(int offset) const {
+void GGUFHandler::CheckOffset(size_t offset) const {
   if (offset > file_size_)
     throw std::runtime_error("Unexpected EOF");
 }
diff --git a/engine/config/gguf_parser.h b/engine/config/gguf_parser.h
@@ -46,7 +46,7 @@ class GGUFHandler {
   size_t ReadArray(std::size_t offset, const std::string& key);
   void ModelConfigFromMetadata();
   void OpenFile(const std::string& file_path);
-  void CheckOffset(int offset) const;
+  void CheckOffset(size_t offset) const;
 
   uint8_t* data_;
   size_t file_size_;
diff --git a/engine/config/yaml_config.cc b/engine/config/yaml_config.cc
@@ -55,7 +55,7 @@ void YamlHandler::ReadYamlFile(const std::string& file_path) {
       }
     }
 
-  } catch (const YAML::BadFile& e) {
+  } catch (const YAML::BadFile&) {
     throw;
   }
 }
diff --git a/engine/database/engines.cc b/engine/database/engines.cc
@@ -60,7 +60,7 @@ std::optional<EngineEntry> Engines::UpsertEngine(
     } else {
       return std::nullopt;
     }
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return std::nullopt;
   }
 }
@@ -87,7 +87,7 @@ std::optional<std::vector<EngineEntry>> Engines::GetEngines() const {
     }
 
     return engines;
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return std::nullopt;
   }
 }
@@ -115,7 +115,7 @@ std::optional<EngineEntry> Engines::GetEngineById(int id) const {
     } else {
       return std::nullopt;
     }
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return std::nullopt;
   }
 }
@@ -155,7 +155,7 @@ std::optional<EngineEntry> Engines::GetEngineByNameAndVariant(
     } else {
       return std::nullopt;
     }
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return std::nullopt;
   }
 }
diff --git a/engine/migrations/migration_manager.cc b/engine/migrations/migration_manager.cc
@@ -24,7 +24,7 @@ int GetSchemaVersion(SQLite::Database& db) {
       version =
           query.getColumn(0).getInt();  // Get the version from the first column
     }
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     // CTL_WRN("SQLite error: " << e.what());
   }
 
diff --git a/engine/repositories/assistant_fs_repository.cc b/engine/repositories/assistant_fs_repository.cc
@@ -103,7 +103,7 @@ cpp::result<void, std::string> AssistantFsRepository::DeleteAssistant(
     }
     try {
       std::filesystem::remove_all(path);
-    } catch (const std::exception& e) {
+    } catch (const std::exception&) {
       return cpp::fail("");
     }
   }
diff --git a/engine/test/components/test_download_task_queue.cc b/engine/test/components/test_download_task_queue.cc
@@ -107,15 +107,15 @@ TEST_F(DownloadTaskQueueTest, ConcurrentPushAndPop) {
   std::atomic<int> poppedTasks{0};
 
   for (int i = 0; i < 4; ++i) {
-    pushThreads.emplace_back([this, i, &pushedTasks]() {
+    pushThreads.emplace_back([this, i, numTasks, &pushedTasks]() {
       for (int j = 0; j < numTasks; ++j) {
         queue.push(CreateDownloadTask("task_" + std::to_string(i) + "_" +
                                       std::to_string(j)));
         pushedTasks++;
       }
     });
 
-    popThreads.emplace_back([this, &poppedTasks, &pushedTasks]() {
+    popThreads.emplace_back([this, numTasks, &poppedTasks, &pushedTasks]() {
       while (poppedTasks.load() < pushedTasks.load() ||
              pushedTasks.load() < numTasks * 4) {
         if (auto task = queue.pop()) {
diff --git a/engine/utils/dylib_path_manager.cc b/engine/utils/dylib_path_manager.cc
@@ -1,5 +1,6 @@
 #include "dylib_path_manager.h"
 #include "utils/logging_utils.h"
+#include "utils/widechar_conv.h"
 
 namespace cortex {
 
@@ -12,8 +13,7 @@ cpp::result<void, std::string> DylibPathManager::RegisterPath(
       return cpp::fail("Path does not exist: " + path.string());
     }
 
-    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
-    std::wstring wide_path = converter.from_bytes(path.string());
+    auto wide_path = cortex::wc::Utf8ToWstring(path.string());
 
     auto cookie = AddDllDirectory(wide_path.c_str());
     if (cookie == nullptr) {
diff --git a/engine/utils/huggingface_utils.h b/engine/utils/huggingface_utils.h
@@ -339,7 +339,7 @@ inline cpp::result<std::string, std::string> GetModelAuthorCortexsoHub(
       return author.as<std::string>();
     }
     return "";
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return "";
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ bool EngineUpdateCmd::Exec(const std::string& host, int port,`
`45`	`45`	`try {`
`46`	`46`	`Json::Value json = json_helper::ParseJsonString(update_result.error());`
`47`	`47`	`std::cout << json["message"].asString() << std::endl;`
`48`		`- } catch (const std::exception& e) {`
	`48`	`+ } catch (const std::exception&) {`
`49`	`49`	`CTL_ERR(update_result.error());`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ void GGUFHandler::OpenFile(const std::string& file_path) {`
`86`	`86`	`#endif`
`87`	`87`	`}`
`88`	`88`
`89`		`-void GGUFHandler::CheckOffset(int offset) const {`
	`89`	`+void GGUFHandler::CheckOffset(size_t offset) const {`
`90`	`90`	`if (offset > file_size_)`
`91`	`91`	`throw std::runtime_error("Unexpected EOF");`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void YamlHandler::ReadYamlFile(const std::string& file_path) {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- } catch (const YAML::BadFile& e) {`
	`58`	`+ } catch (const YAML::BadFile&) {`
`59`	`59`	`throw;`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ std::optional<EngineEntry> Engines::UpsertEngine(`
`60`	`60`	`} else {`
`61`	`61`	`return std::nullopt;`
`62`	`62`	`}`
`63`		`- } catch (const std::exception& e) {`
	`63`	`+ } catch (const std::exception&) {`
`64`	`64`	`return std::nullopt;`
`65`	`65`	`}`
`66`	`66`	`}`
`@@ -87,7 +87,7 @@ std::optional<std::vector<EngineEntry>> Engines::GetEngines() const {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`return engines;`
`90`		`- } catch (const std::exception& e) {`
	`90`	`+ } catch (const std::exception&) {`
`91`	`91`	`return std::nullopt;`
`92`	`92`	`}`
`93`	`93`	`}`
`@@ -115,7 +115,7 @@ std::optional<EngineEntry> Engines::GetEngineById(int id) const {`
`115`	`115`	`} else {`
`116`	`116`	`return std::nullopt;`
`117`	`117`	`}`
`118`		`- } catch (const std::exception& e) {`
	`118`	`+ } catch (const std::exception&) {`
`119`	`119`	`return std::nullopt;`
`120`	`120`	`}`
`121`	`121`	`}`
`@@ -155,7 +155,7 @@ std::optional<EngineEntry> Engines::GetEngineByNameAndVariant(`
`155`	`155`	`} else {`
`156`	`156`	`return std::nullopt;`
`157`	`157`	`}`
`158`		`- } catch (const std::exception& e) {`
	`158`	`+ } catch (const std::exception&) {`
`159`	`159`	`return std::nullopt;`
`160`	`160`	`}`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ int GetSchemaVersion(SQLite::Database& db) {`
`24`	`24`	`version =`
`25`	`25`	`query.getColumn(0).getInt(); // Get the version from the first column`
`26`	`26`	`}`
`27`		`- } catch (const std::exception& e) {`
	`27`	`+ } catch (const std::exception&) {`
`28`	`28`	`// CTL_WRN("SQLite error: " << e.what());`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ cpp::result<void, std::string> AssistantFsRepository::DeleteAssistant(`
`103`	`103`	`}`
`104`	`104`	`try {`
`105`	`105`	`std::filesystem::remove_all(path);`
`106`		`- } catch (const std::exception& e) {`
	`106`	`+ } catch (const std::exception&) {`
`107`	`107`	`return cpp::fail("");`
`108`	`108`	`}`
`109`	`109`	`}`