diff --git a/source/detail/stylesheet.hpp b/source/detail/stylesheet.hpp index b2697844..8427e17b 100644 --- a/source/detail/stylesheet.hpp +++ b/source/detail/stylesheet.hpp @@ -65,11 +65,6 @@ struct stylesheet { ~stylesheet() {} - std::size_t index(const format &f) - { - return ::index(formats, f); - } - std::size_t index(const std::string &style_name) { auto match = std::find_if(styles.begin(), styles.end(), diff --git a/source/styles/color.cpp b/source/styles/color.cpp index 870cb930..376092e0 100644 --- a/source/styles/color.cpp +++ b/source/styles/color.cpp @@ -22,6 +22,8 @@ // @license: http://www.opensource.org/licenses/mit-license.php // @author: see AUTHORS file +#include + #include #include @@ -163,7 +165,7 @@ std::string rgb_color::get_hex_string() const std::array rgb_color::decode_hex_string(const std::string &hex_string) { - auto x = strtoul(hex_string.c_str(), NULL, 16); + auto x = std::strtoul(hex_string.c_str(), NULL, 16); auto a = static_cast(x >> 24); auto r = static_cast((x >> 16) & 0xff); diff --git a/tests/helpers/path_helper.hpp b/tests/helpers/path_helper.hpp index 15b44070..ea55761b 100644 --- a/tests/helpers/path_helper.hpp +++ b/tests/helpers/path_helper.hpp @@ -30,7 +30,7 @@ public: if (_NSGetExecutablePath(path.data(), &size) == 0) { - return std::string(path.begin(), std::find(path.begin(), path.end(), '\0') - 9); + return xlnt::path(std::string(path.begin(), std::find(path.begin(), path.end(), '\0') - 9)); } throw std::runtime_error("buffer too small, " + std::to_string(path.size()) + ", should be: " + std::to_string(size));