diff --git a/Unit testing/CMakeLists.txt b/Unit testing/CMakeLists.txt index cf47abc..2b91628 100644 --- a/Unit testing/CMakeLists.txt +++ b/Unit testing/CMakeLists.txt @@ -12,7 +12,7 @@ add_executable(UnitTest ) set_target_properties(Catch2 UnitTest PROPERTIES - CXX_STANDARD 23 + CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF INTERPROCEDURAL_OPTIMIZATION_RELEASE ON diff --git a/src/generic_object.cpp b/src/generic_object.cpp index 7ce6588..70fd557 100644 --- a/src/generic_object.cpp +++ b/src/generic_object.cpp @@ -31,7 +31,7 @@ namespace character { std::uint32_t Weapons::add_damage() const noexcept { return type == weapons::Morgenstern ? 1 : 0; } - std::int32_t Weapons::add_materiel(const characType &inType) const noexcept { + std::int32_t Weapons::add_materiel(const characteristic::characType &inType) const noexcept { switch (type) { case weapons::Sword: if (inType == characType::Habilete) { @@ -94,7 +94,7 @@ namespace character { std::uint32_t Equipments::add_damage() const noexcept { return 0; } - std::int32_t Equipments::add_materiel(const characType &inType) const noexcept { + std::int32_t Equipments::add_materiel(const characteristic::characType &inType) const noexcept { switch (type) { case equipments::Chainmail: if (inType == characType::Habilete || @@ -130,7 +130,7 @@ namespace character { std::uint32_t Tools::add_damage() const noexcept { return 0; } - std::int32_t Tools::add_materiel(const characType &inType) const noexcept { + std::int32_t Tools::add_materiel(const characteristic::characType &inType) const noexcept { switch (type) { case tools::Fourche: switch (inType) { @@ -166,4 +166,4 @@ namespace character { return sackOfGrain; } } -} +} \ No newline at end of file