Pcornat/BillySheet
1
0
Fork 0
Code Issues Pull requests Releases Activity

Compare commits

base: Pcornat:618dad7df1942ae29b14ed59957610c901870626
Branches Tags
Pcornat:master
...
compare: Pcornat:e17764dc8835192211b1f3b72cf050a909b3967b
Branches Tags
Pcornat:master

2 commits
618dad7df1 ... e17764dc88

Author SHA1 Message Date
Pcornat
e17764dc88
 		Changing the logger's name 2022-06-09 21:53:18 +02:00
Pcornat
340a4516dd
 		Disabling implicit conversions. 2022-06-09 21:52:49 +02:00
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -97,6 +97,8 @@ option(SPDLOG_NO_ATOMIC_LEVELS "prevent spdlog from using of std::atomic log lev
add_subdirectory(external/spdlog) add_subdirectory(external/spdlog)
set(JSON_BuildTests OFF CACHE INTERNAL "") 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) add_subdirectory(external/json)
option(CATCH_INSTALL_DOCS "Install documentation alongside library" OFF) option(CATCH_INSTALL_DOCS "Install documentation alongside library" OFF)

8
include/characteristic/characteristic.hpp
View file

@ -41,10 +41,10 @@ namespace character::characteristic {
[[nodiscard]] std::uint32_t get_additional() const { return additional; } [[nodiscard]] std::uint32_t get_additional() const { return additional; }
friend void from_json(const json &j, Characteristic &charac) { friend void from_json(const json &j, Characteristic &charac) {
const_cast<std::uint32_t &>(charac.base) = j.at("base"); const_cast<std::uint32_t &>(charac.base) = j.at("base").get<std::uint32_t>();
charac.carac = j.at("carac"); charac.carac = j.at("carac").get<std::uint32_t>();
charac.materiel = j.at("materiel"); charac.materiel = j.at("materiel").get<std::uint32_t>();
charac.additional = j.at("additional"); charac.additional = j.at("additional").get<std::uint32_t>();
} }
}; };

2
src/main.cpp
View file

@ -9,7 +9,7 @@
int main() { int main() {
std::ios::sync_with_stdio(false); std::ios::sync_with_stdio(false);
spdlog::set_default_logger(spdlog::stdout_color_st("console")); spdlog::set_default_logger(spdlog::stdout_color_st("BillySheet"));
try { try {
gui::Window window; gui::Window window;