Merge branch 'v3' of github.com:ToruNiina/toml11 into v3

This commit is contained in:
ToruNiina
2019-06-21 14:31:52 +09:00
8 changed files with 102 additions and 64 deletions

View File

@@ -601,7 +601,7 @@ class basic_value
: type_(value_t::floating),
region_info_(std::make_shared<region_base>(region_base{}))
{
assigner(this->floating_, f);
assigner(this->floating_, static_cast<floating>(f));
}
template<typename T, typename Container, typename std::enable_if<
@@ -611,7 +611,7 @@ class basic_value
region_info_(std::make_shared<detail::region<Container>>(std::move(reg))),
comments_(region_info_->comments())
{
assigner(this->floating_, f);
assigner(this->floating_, static_cast<floating>(f));
}
template<typename T, typename std::enable_if<
@@ -621,7 +621,7 @@ class basic_value
this->cleanup();
this->type_ = value_t::floating;
this->region_info_ = std::make_shared<region_base>(region_base{});
assigner(this->floating_, f);
assigner(this->floating_, static_cast<floating>(f));
return *this;
}