upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-24 20:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store pointers in unique_ptr

Browse Source
This commit is contained in:
Alexander van Gessel 2018-01-16 11:32:17 +01:00
parent bbdb5ad86a
commit 65dd884b50
No known key found for this signature in database
GPG Key ID: ED28AFE007041A1F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/serialization/preprocessor.cpp
View File

@ -1488,13 +1488,13 @@ bool preprocessor_data::get_chunk()
buf->textdomain_ = parent_.textdomain_; buf->textdomain_ = parent_.textdomain_;
std::istream in(buf.get()); std::istream in(buf.get());
std::istringstream* buffer = new std::istringstream(argument.second); filesystem::scoped_istream buffer{new std::istringstream(argument.second)};
std::map<std::string, std::string>* temp_defines = new std::map<std::string, std::string>; std::map<std::string, std::string>* temp_defines = new std::map<std::string, std::string>;
temp_defines->insert(defines->begin(), defines->end()); temp_defines->insert(defines->begin(), defines->end());
buf->add_preprocessor<preprocessor_data>( buf->add_preprocessor<preprocessor_data>(
buffer, val.location, "", val.linenum, dir, val.textdomain, temp_defines, false); buffer.release(), val.location, "", val.linenum, dir, val.textdomain, temp_defines, false);
std::ostringstream res; std::ostringstream res;
res << in.rdbuf(); res << in.rdbuf();
@ -1516,7 +1516,7 @@ bool preprocessor_data::get_chunk()
parent_.error(error.str(), linenum_); parent_.error(error.str(), linenum_);
} }
std::istringstream* buffer = new std::istringstream(val.value); filesystem::scoped_istream buffer{new std::istringstream(val.value)};
pop_token(); pop_token();
@ -1524,7 +1524,7 @@ bool preprocessor_data::get_chunk()
DBG_PREPROC << "substituting macro " << symbol << '\n'; DBG_PREPROC << "substituting macro " << symbol << '\n';
parent_.add_preprocessor<preprocessor_data>( parent_.add_preprocessor<preprocessor_data>(
buffer, val.location, "", val.linenum, dir, val.textdomain, defines, true); buffer.release(), val.location, "", val.linenum, dir, val.textdomain, defines, true);
} else { } else {
DBG_PREPROC << "substituting (slow) macro " << symbol << '\n'; DBG_PREPROC << "substituting (slow) macro " << symbol << '\n';
@ -1538,7 +1538,7 @@ bool preprocessor_data::get_chunk()
{ {
std::istream in(buf.get()); std::istream in(buf.get());
buf->add_preprocessor<preprocessor_data>( buf->add_preprocessor<preprocessor_data>(
buffer, val.location, "", val.linenum, dir, val.textdomain, defines, true); buffer.release(), val.location, "", val.linenum, dir, val.textdomain, defines, true);
res << in.rdbuf(); res << in.rdbuf();
} }