zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-18 19:10:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: avoid deprecated stuff in the internal code

Browse Source
This commit is contained in:
ToruNiina
2019-06-07 13:27:10 +09:00
parent 62c993e096
commit 7db8388d17
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
toml/value.hpp
View File

@@ -782,9 +782,9 @@ struct switch_cast<value_t::Integer>
template<> template<>
struct switch_cast<value_t::Float> struct switch_cast<value_t::Float>
{ {
static ::toml::floating& invoke(value& v) {return v.as_float();} static ::toml::floating& invoke(value& v) {return v.as_floating();}
static ::toml::floating const& invoke(value const& v) {return v.as_float();} static ::toml::floating const& invoke(value const& v) {return v.as_floating();}
static ::toml::floating&& invoke(value&& v) {return std::move(v).as_float();} static ::toml::floating&& invoke(value&& v) {return std::move(v).as_floating();}
}; };
template<> template<>
struct switch_cast<value_t::String> struct switch_cast<value_t::String>
@@ -880,7 +880,7 @@ inline bool operator==(const toml::value& lhs, const toml::value& rhs)
} }
case value_t::Float : case value_t::Float :
{ {
return lhs.as_float() == rhs.as_float(); return lhs.as_floating() == rhs.as_floating();
} }
case value_t::String : case value_t::String :
{ {
@@ -930,7 +930,7 @@ inline bool operator<(const toml::value& lhs, const toml::value& rhs)
} }
case value_t::Float : case value_t::Float :
{ {
return lhs.as_float() < rhs.as_float(); return lhs.as_floating() < rhs.as_floating();
} }
case value_t::String : case value_t::String :
{ {
@@ -1027,7 +1027,7 @@ visit(Visitor&& visitor, const toml::value& v)
{ {
case value_t::Boolean : {return visitor(v.as_boolean ());} case value_t::Boolean : {return visitor(v.as_boolean ());}
case value_t::Integer : {return visitor(v.as_integer ());} case value_t::Integer : {return visitor(v.as_integer ());}
case value_t::Float : {return visitor(v.as_float ());} case value_t::Float : {return visitor(v.as_floating ());}
case value_t::String : {return visitor(v.as_string ());} case value_t::String : {return visitor(v.as_string ());}
case value_t::OffsetDatetime: {return visitor(v.as_offset_datetime());} case value_t::OffsetDatetime: {return visitor(v.as_offset_datetime());}
case value_t::LocalDatetime : {return visitor(v.as_local_datetime ());} case value_t::LocalDatetime : {return visitor(v.as_local_datetime ());}
@@ -1051,7 +1051,7 @@ visit(Visitor&& visitor, toml::value& v)
{ {
case value_t::Boolean : {return visitor(v.as_boolean ());} case value_t::Boolean : {return visitor(v.as_boolean ());}
case value_t::Integer : {return visitor(v.as_integer ());} case value_t::Integer : {return visitor(v.as_integer ());}
case value_t::Float : {return visitor(v.as_float ());} case value_t::Float : {return visitor(v.as_floating ());}
case value_t::String : {return visitor(v.as_string ());} case value_t::String : {return visitor(v.as_string ());}
case value_t::OffsetDatetime: {return visitor(v.as_offset_datetime());} case value_t::OffsetDatetime: {return visitor(v.as_offset_datetime());}
case value_t::LocalDatetime : {return visitor(v.as_local_datetime ());} case value_t::LocalDatetime : {return visitor(v.as_local_datetime ());}
@@ -1075,7 +1075,7 @@ visit(Visitor&& visitor, toml::value&& v)
{ {
case value_t::Boolean : {return visitor(std::move(v.as_boolean ()));} case value_t::Boolean : {return visitor(std::move(v.as_boolean ()));}
case value_t::Integer : {return visitor(std::move(v.as_integer ()));} case value_t::Integer : {return visitor(std::move(v.as_integer ()));}
case value_t::Float : {return visitor(std::move(v.as_float ()));} case value_t::Float : {return visitor(std::move(v.as_floating ()));}
case value_t::String : {return visitor(std::move(v.as_string ()));} case value_t::String : {return visitor(std::move(v.as_string ()));}
case value_t::OffsetDatetime: {return visitor(std::move(v.as_offset_datetime()));} case value_t::OffsetDatetime: {return visitor(std::move(v.as_offset_datetime()));}
case value_t::LocalDatetime : {return visitor(std::move(v.as_local_datetime ()));} case value_t::LocalDatetime : {return visitor(std::move(v.as_local_datetime ()));}