diff --git a/include/Cubed/tools/toml.utils.hpp b/include/Cubed/tools/toml.utils.hpp index cfec703..97a2984 100644 --- a/include/Cubed/tools/toml.utils.hpp +++ b/include/Cubed/tools/toml.utils.hpp @@ -27,14 +27,6 @@ std::optional safe_get_value(const toml::table& table, std::string_view key, } return value; } -template - requires std::convertible_to -std::optional safe_get_value(const toml::table& table, - std::string_view key, - U&& default_value) { - return safe_get_value( - table, key, std::string(std::forward(default_value))); -} } // namespace TOML diff --git a/src/app.cpp b/src/app.cpp index 50cb74a..934fff7 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -99,7 +99,7 @@ void App::handle_argument(int argc, char** argv) { auto r = std::from_chars(arg.data(), arg.data() + arg.size(), m_argument.port); - if (r.ec != std::errc{} || arg.data() + arg.size()) { + if (r.ec != std::errc{} || r.ptr != arg.data() + arg.size()) { throw std::runtime_error( std::format("Invalid port: {}", arg)); } @@ -143,7 +143,8 @@ void App::handle_toml() { return; } - m_argument.ip = *TOML::safe_get_value(server, "ip", "127.0.01"); + m_argument.ip = + *TOML::safe_get_value(server, "ip", std::string("127.0.01")); m_argument.port = *TOML::safe_get_value(server, "port", 25530); m_argument.is_client = *TOML::safe_get_value(server, "client", false); }