Use C++17 <optional> in csscolorparser (#2071)

maplibre · Jan 30, 2024 · ea15e7b · ea15e7b
1 parent bf15332
commit ea15e7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/vendor/csscolorparser/csscolorparser.cpp b/vendor/csscolorparser/csscolorparser.cpp
@@ -176,7 +176,7 @@ std::vector<std::string> split(const std::string& s, char delim) {
     return elems;
 }
 
-std::experimental::optional<Color> parse(const std::string& css_str) {
+std::optional<Color> parse(const std::string& css_str) {
     std::string str = css_str;
 
     // Remove all whitespace, not compliant, but should just be more accepting.

diff --git a/vendor/csscolorparser/csscolorparser/csscolorparser.hpp b/vendor/csscolorparser/csscolorparser/csscolorparser.hpp
@@ -25,8 +25,7 @@
 #ifndef CSS_COLOR_PARSER_CPP
 #define CSS_COLOR_PARSER_CPP
 
-#include <optional.hpp>
-
+#include <optional>
 #include <string>
 #include <cmath>
 
@@ -50,7 +49,7 @@ inline bool operator!=(const Color& lhs, const Color& rhs) {
     return !(lhs == rhs);
 }
 
-std::experimental::optional<Color> parse(const std::string& css_str);
+std::optional<Color> parse(const std::string& css_str);
 
 } // namespace CSSColorParser