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

Merge pull request #67 from ToruNiina/hotfix

Browse Source 
suppress warnings on clang v7+
This commit is contained in:
Toru Niina
2019-06-10 10:54:54 +09:00
committed by GitHub
parent cfaa94f072 06ae67502a
commit e66bb3d359
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
toml/get.hpp
View File

@@ -545,7 +545,7 @@ std::string get_or(toml::value&& v, T&& opt)
} }
catch(...) catch(...)
{ {
return opt; return std::forward<T>(opt);
} }
} }
template<typename T, typename std::enable_if< template<typename T, typename std::enable_if<
@@ -643,9 +643,9 @@ template<typename T, typename std::enable_if<
std::is_same<T, std::string>::value, std::nullptr_t>::type = nullptr> std::is_same<T, std::string>::value, std::nullptr_t>::type = nullptr>
std::string find_or(toml::value&& v, const toml::key& ky, T&& opt) std::string find_or(toml::value&& v, const toml::key& ky, T&& opt)
{ {
if(!v.is_table()) {return opt;} if(!v.is_table()) {return std::forward<T>(opt);}
auto tab = toml::get<toml::table>(std::move(v)); auto tab = toml::get<toml::table>(std::move(v));
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)); return get_or(std::move(tab[ky]), std::forward<T>(opt));
} }
@@ -726,7 +726,7 @@ template<typename T, typename std::enable_if<
std::is_same<T, std::string>::value, std::nullptr_t>::type = nullptr> std::is_same<T, std::string>::value, std::nullptr_t>::type = nullptr>
std::string find_or(toml::table&& tab, const toml::key& ky, T&& opt) std::string find_or(toml::table&& tab, const toml::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)); return get_or(std::move(tab[ky]), std::forward<T>(opt));
} }