0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace custom scoped_resource with unique_ptr

Browse source
This commit is contained in:
loonycyborg 2016-09-13 19:03:33 +03:00
parent 862fd5f93b
commit fe07bf500e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/desktop/version.cpp
View file

@ -86,7 +86,7 @@ struct posix_pipe_release_policy
* The stream object type is the same as a regular file stream, but the release
* policy is different, as required by popen(3).
*/
typedef util::scoped_resource<std::FILE*, posix_pipe_release_policy> scoped_posix_pipe;
typedef std::unique_ptr<std::FILE, posix_pipe_release_policy> scoped_posix_pipe;
/**
* Read a single line from the specified pipe.
@ -105,7 +105,7 @@ std::string read_pipe_line(scoped_posix_pipe& p)
ver.reserve(64);
// We only want the first line.
while((c = std::fgetc(p)) && c != EOF && c != '\n' && c != '\r') {
while((c = std::fgetc(p.get())) && c != EOF && c != '\n' && c != '\r') {
ver.push_back(static_cast<char>(c));
}