zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-12-16 03:08:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat [skip ci]: update single_include

Browse Source
This commit is contained in:
ToruNiina
2024-07-05 15:41:19 +00:00
parent 0eb9a90abf
commit be7d7257c9
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
single_include/toml.hpp
View File

@@ -57,6 +57,11 @@
#define TOML11_CXX20_VALUE 202002L #define TOML11_CXX20_VALUE 202002L
#endif//TOML11_CXX20_VALUE #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 TOML11_CPLUSPLUS_STANDARD_VERSION >= TOML11_CXX17_VALUE
# if __has_include(<string_view>) # if __has_include(<string_view>)
@@ -4073,13 +4078,13 @@ struct result
{ {
if(other.is_ok()) 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_)); assert(tmp == std::addressof(this->succ_));
(void)tmp; (void)tmp;
} }
else 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_)); assert(tmp == std::addressof(this->fail_));
(void)tmp; (void)tmp;
} }
@@ -4088,13 +4093,13 @@ struct result
{ {
if(other.is_ok()) 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_)); assert(tmp == std::addressof(this->succ_));
(void)tmp; (void)tmp;
} }
else 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_)); assert(tmp == std::addressof(this->fail_));
(void)tmp; (void)tmp;
} }
@@ -4105,13 +4110,13 @@ struct result
this->cleanup(); this->cleanup();
if(other.is_ok()) 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_)); assert(tmp == std::addressof(this->succ_));
(void)tmp; (void)tmp;
} }
else 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_)); assert(tmp == std::addressof(this->fail_));
(void)tmp; (void)tmp;
} }
@@ -4123,13 +4128,13 @@ struct result
this->cleanup(); this->cleanup();
if(other.is_ok()) 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_)); assert(tmp == std::addressof(this->succ_));
(void)tmp; (void)tmp;
} }
else 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_)); assert(tmp == std::addressof(this->fail_));
(void)tmp; (void)tmp;
} }
@@ -15400,12 +15405,6 @@ inline namespace toml_literals
::toml::value operator"" _toml(const char* str, std::size_t len); ::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) #if defined(TOML11_HAS_CHAR8_T)
// value of u8"" literal has been changed from char to char8_t and char8_t is // value of u8"" literal has been changed from char to char8_t and char8_t is
// NOT compatible to char // NOT compatible to char