diff --git a/CMakeLists.txt b/CMakeLists.txt index 50070c0..7a85252 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,8 +97,6 @@ option(SPDLOG_NO_ATOMIC_LEVELS "prevent spdlog from using of std::atomic log lev add_subdirectory(external/spdlog) set(JSON_BuildTests OFF CACHE INTERNAL "") -option(JSON_ImplicitConversions "Enable implicit conversions." OFF) -option(JSON_SystemInclude "Include as system headers (skip for clang-tidy)." ON) add_subdirectory(external/json) option(CATCH_INSTALL_DOCS "Install documentation alongside library" OFF) diff --git a/include/characteristic/characteristic.hpp b/include/characteristic/characteristic.hpp index 72cd433..2567303 100644 --- a/include/characteristic/characteristic.hpp +++ b/include/characteristic/characteristic.hpp @@ -41,10 +41,10 @@ namespace character::characteristic { [[nodiscard]] std::uint32_t get_additional() const { return additional; } friend void from_json(const json &j, Characteristic &charac) { - const_cast(charac.base) = j.at("base").get(); - charac.carac = j.at("carac").get(); - charac.materiel = j.at("materiel").get(); - charac.additional = j.at("additional").get(); + const_cast(charac.base) = j.at("base"); + charac.carac = j.at("carac"); + charac.materiel = j.at("materiel"); + charac.additional = j.at("additional"); } }; diff --git a/src/main.cpp b/src/main.cpp index 4002d10..38426dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -9,7 +9,7 @@ int main() { std::ios::sync_with_stdio(false); - spdlog::set_default_logger(spdlog::stdout_color_st("BillySheet")); + spdlog::set_default_logger(spdlog::stdout_color_st("console")); try { gui::Window window;