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

Merge pull request #189 from muggenhor/fix/avoid-fname-copy

Browse Source 
fix: don't force a copy of std::string fname when moving is an option
This commit is contained in:
Toru Niina
2022-06-04 20:49:33 +09:00
committed by GitHub
parent 25be97dc39 aff6f0f574
commit 6d9e533cf1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
toml/parser.hpp
View File

@@ -2317,7 +2317,7 @@ template<typename Comment = TOML11_DEFAULT_COMMENT_STRATEGY,
template<typename ...> class Table = std::unordered_map, template<typename ...> class Table = std::unordered_map,
template<typename ...> class Array = std::vector> template<typename ...> class Array = std::vector>
basic_value<Comment, Table, Array> basic_value<Comment, Table, Array>
parse(std::istream& is, const std::string& fname = "unknown file") parse(std::istream& is, std::string fname = "unknown file")
{ {
using value_type = basic_value<Comment, Table, Array>; using value_type = basic_value<Comment, Table, Array>;
@@ -2372,14 +2372,14 @@ parse(std::istream& is, const std::string& fname = "unknown file")
template<typename Comment = TOML11_DEFAULT_COMMENT_STRATEGY, template<typename Comment = TOML11_DEFAULT_COMMENT_STRATEGY,
template<typename ...> class Table = std::unordered_map, template<typename ...> class Table = std::unordered_map,
template<typename ...> class Array = std::vector> template<typename ...> class Array = std::vector>
basic_value<Comment, Table, Array> parse(const std::string& fname) basic_value<Comment, Table, Array> parse(std::string fname)
{ {
std::ifstream ifs(fname.c_str(), std::ios_base::binary); std::ifstream ifs(fname.c_str(), std::ios_base::binary);
if(!ifs.good()) if(!ifs.good())
{ {
throw std::runtime_error("toml::parse: file open error -> " + fname); throw std::runtime_error("toml::parse: file open error -> " + fname);
} }
return parse<Comment, Table, Array>(ifs, fname); return parse<Comment, Table, Array>(ifs, std::move(fname));
} }
#ifdef TOML11_HAS_STD_FILESYSTEM #ifdef TOML11_HAS_STD_FILESYSTEM