From be7d7257c98b44a60462ad5e43337f730dc69c97 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Fri, 5 Jul 2024 15:41:19 +0000 Subject: [PATCH] feat [skip ci]: update single_include --- single_include/toml.hpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/single_include/toml.hpp b/single_include/toml.hpp index 57ec3d6..2207521 100644 --- a/single_include/toml.hpp +++ b/single_include/toml.hpp @@ -57,6 +57,11 @@ #define TOML11_CXX20_VALUE 202002L #endif//TOML11_CXX20_VALUE +#if defined(__cpp_char8_t) +# if __cpp_char8_t >= 201811L +# define TOML11_HAS_CHAR8_T 1 +# endif +#endif #if TOML11_CPLUSPLUS_STANDARD_VERSION >= TOML11_CXX17_VALUE # if __has_include() @@ -4073,13 +4078,13 @@ struct result { if(other.is_ok()) { - auto tmp = ::new(std::addressof(this->succ_)) success_type(other.as_ok()); + auto tmp = ::new(std::addressof(this->succ_)) success_type(other.succ_); assert(tmp == std::addressof(this->succ_)); (void)tmp; } else { - auto tmp = ::new(std::addressof(this->fail_)) failure_type(other.as_err()); + auto tmp = ::new(std::addressof(this->fail_)) failure_type(other.fail_); assert(tmp == std::addressof(this->fail_)); (void)tmp; } @@ -4088,13 +4093,13 @@ struct result { if(other.is_ok()) { - auto tmp = ::new(std::addressof(this->succ_)) success_type(std::move(other.as_ok())); + auto tmp = ::new(std::addressof(this->succ_)) success_type(std::move(other.succ_)); assert(tmp == std::addressof(this->succ_)); (void)tmp; } else { - auto tmp = ::new(std::addressof(this->fail_)) failure_type(std::move(other.as_err())); + auto tmp = ::new(std::addressof(this->fail_)) failure_type(std::move(other.fail_)); assert(tmp == std::addressof(this->fail_)); (void)tmp; } @@ -4105,13 +4110,13 @@ struct result this->cleanup(); if(other.is_ok()) { - auto tmp = ::new(std::addressof(this->succ_)) success_type(other.as_ok()); + auto tmp = ::new(std::addressof(this->succ_)) success_type(other.succ_); assert(tmp == std::addressof(this->succ_)); (void)tmp; } else { - auto tmp = ::new(std::addressof(this->fail_)) failure_type(other.as_err()); + auto tmp = ::new(std::addressof(this->fail_)) failure_type(other.fail_); assert(tmp == std::addressof(this->fail_)); (void)tmp; } @@ -4123,13 +4128,13 @@ struct result this->cleanup(); if(other.is_ok()) { - auto tmp = ::new(std::addressof(this->succ_)) success_type(std::move(other.as_ok())); + auto tmp = ::new(std::addressof(this->succ_)) success_type(std::move(other.succ_)); assert(tmp == std::addressof(this->succ_)); (void)tmp; } else { - auto tmp = ::new(std::addressof(this->fail_)) failure_type(std::move(other.as_err())); + auto tmp = ::new(std::addressof(this->fail_)) failure_type(std::move(other.fail_)); assert(tmp == std::addressof(this->fail_)); (void)tmp; } @@ -15400,12 +15405,6 @@ inline namespace toml_literals ::toml::value operator"" _toml(const char* str, std::size_t len); -#if defined(__cpp_char8_t) -# if __cpp_char8_t >= 201811L -# define TOML11_HAS_CHAR8_T 1 -# endif -#endif - #if defined(TOML11_HAS_CHAR8_T) // value of u8"" literal has been changed from char to char8_t and char8_t is // NOT compatible to char