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

🔀 Merge branch 'master' into v3

Browse Source
This commit is contained in:
ToruNiina
2019-06-15 15:17:08 +09:00
parent 6345910c3e b2daf916b3
commit d8a9ee4f72
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
toml/get.hpp
View File

@@ -713,7 +713,7 @@ get_or(basic_value<C, M, V>&& v, T&& opt)
}
catch(...)
{
return std::string(opt);
return std::forward<T>(opt);
}
}
@@ -829,10 +829,10 @@ template<typename T, typename C,
detail::enable_if_t<std::is_same<T, std::string>::value, std::string>
find_or(basic_value<C, M, V>&& v, const toml::key& ky, T&& opt)
{
if(!v.is_table()) {return opt;}
auto tab = std::move(v).as_table();
if(tab.count(ky) == 0) {return opt;}
return get_or(std::move(tab.at(ky)), std::forward<T>(opt));
if(!v.is_table()) {return std::forward<T>(opt);}
auto tab = toml::get<toml::table>(std::move(v));
if(tab.count(ky) == 0) {return std::forward<T>(opt);}
return get_or(std::move(tab[ky]), std::forward<T>(opt));
}
// ---------------------------------------------------------------------------
@@ -934,7 +934,7 @@ detail::enable_if_t<detail::conjunction<
>::value, std::string>
find_or(Table&& tab, const key& ky, T&& opt)
{
if(tab.count(ky) == 0) {return opt;}
if(tab.count(ky) == 0) {return std::forward<T>(opt);}
return get_or(std::move(tab[ky]), std::forward<T>(opt));
}