From 340a4516dd6d0af47aa793a48a308ce184c12e4c Mon Sep 17 00:00:00 2001 From: Pcornat Date: Thu, 9 Jun 2022 21:52:49 +0200 Subject: [PATCH] Disabling implicit conversions. --- CMakeLists.txt | 2 ++ include/characteristic/characteristic.hpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a85252..50070c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,8 @@ 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 2567303..72cd433 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"); - charac.carac = j.at("carac"); - charac.materiel = j.at("materiel"); - charac.additional = j.at("additional"); + 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(); } };