diff --git a/include/billy_objects.hpp b/include/billy_objects.hpp index d03879a..46152e9 100644 --- a/include/billy_objects.hpp +++ b/include/billy_objects.hpp @@ -49,8 +49,6 @@ namespace character { static std::string_view billy_object_to_string(const billyObjects &object) noexcept; - static std::string_view billy_object_to_string(const billyEnums &object) noexcept; - static void to_json(json &j, const container &billy); static void from_json(const json &j, container &billy); diff --git a/include/generic_object.hpp b/include/generic_object.hpp index da3422c..72c0353 100644 --- a/include/generic_object.hpp +++ b/include/generic_object.hpp @@ -78,7 +78,7 @@ namespace character { public: const weapons type{ weapons::Sword }; - explicit Weapons(const weapons type) noexcept : type(type) {} + explicit Weapons(const weapons type) : type(type) {} Weapons() = delete; @@ -101,7 +101,7 @@ namespace character { public: const equipments type{ equipments::Chainmail }; - explicit Equipments(const equipments type) noexcept : type(type) {} + explicit Equipments(const equipments type) : type(type) {} Equipments() = delete; @@ -124,7 +124,7 @@ namespace character { public: const tools type{ tools::Fourche }; - explicit Tools(const tools type) noexcept : type(type) {} + explicit Tools(const tools type) : type(type) {} Tools() = delete; @@ -144,4 +144,4 @@ namespace character { }; } // character -#endif //BILLYSHEET_GENERIC_OBJECT_HPP +#endif //BILLYSHEET_GENERIC_OBJECT_HPP \ No newline at end of file diff --git a/src/billy_objects.cpp b/src/billy_objects.cpp index 7fd747c..52cf96d 100644 --- a/src/billy_objects.cpp +++ b/src/billy_objects.cpp @@ -113,15 +113,6 @@ namespace character { return object->to_string(); } - std::string_view BillyObjects::billy_object_to_string(const billyEnums &object) noexcept { - return std::visit(overloaded{ - [](const weapons &obj) { return Weapons{ obj }.to_string(); }, - [](const equipments &obj) { return Equipments{ obj }.to_string(); }, - [](const tools &obj) { return Tools{ obj }.to_string(); }, - }, - object); - } - void BillyObjects::from_json(const json &j, container &billy) { for (const auto &element: j) { const std::uint32_t key = element[0].get();