From 407c9cfab5e5d872f833b1162d581339c0555932 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 15 Aug 2019 11:18:47 -0400 Subject: [PATCH] DNAYaml: Replace implementation-specific functions with standardized equivalents --- src/athena/DNAYaml.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/athena/DNAYaml.cpp b/src/athena/DNAYaml.cpp index fa2be64..6021982 100644 --- a/src/athena/DNAYaml.cpp +++ b/src/athena/DNAYaml.cpp @@ -88,11 +88,7 @@ std::unique_ptr ValToNode(atUint32 val) { template <> atInt64 NodeToVal(const YAMLNode* node) { -#if _WIN32 - return _strtoi64(node->m_scalarString.c_str(), nullptr, 0); -#else - return strtoq(node->m_scalarString.c_str(), nullptr, 0); -#endif + return std::strtoll(node->m_scalarString.c_str(), nullptr, 0); } std::unique_ptr ValToNode(atInt64 val) { @@ -103,11 +99,7 @@ std::unique_ptr ValToNode(atInt64 val) { template <> atUint64 NodeToVal(const YAMLNode* node) { -#if _WIN32 - return _strtoui64(node->m_scalarString.c_str(), nullptr, 0); -#else - return strtouq(node->m_scalarString.c_str(), nullptr, 0); -#endif + return std::strtoull(node->m_scalarString.c_str(), nullptr, 0); } std::unique_ptr ValToNode(atUint64 val) {