summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/command/DatabaseCommands.cxx8
-rw-r--r--src/db/plugins/simple/SimpleDatabasePlugin.cxx2
-rw-r--r--src/decoder/plugins/WavpackDecoderPlugin.cxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx
index c87088611..174144a47 100644
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@@ -227,7 +227,7 @@ handle_list_file(Client &client, Request args, Response &r)
std::unique_ptr<SongFilter> filter;
if (!args.empty()) {
- filter.reset(new SongFilter());
+ filter = std::make_unique<SongFilter>();
try {
filter->Parse(args, false);
} catch (...) {
@@ -272,8 +272,8 @@ handle_list(Client &client, Request args, Response &r)
return CommandResult::ERROR;
}
- filter.reset(new SongFilter(TAG_ARTIST,
- args.shift()));
+ filter = std::make_unique<SongFilter>(TAG_ARTIST,
+ args.shift());
}
while (args.size >= 2 &&
@@ -302,7 +302,7 @@ handle_list(Client &client, Request args, Response &r)
tag_types.emplace_back(tagType);
if (!args.empty()) {
- filter.reset(new SongFilter());
+ filter = std::make_unique<SongFilter>();
try {
filter->Parse(args, false);
} catch (...) {
diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
index c54480fd1..05fc688a1 100644
--- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
@@ -365,7 +365,7 @@ SimpleDatabase::Save()
#ifdef ENABLE_ZLIB
std::unique_ptr<GzipOutputStream> gzip;
if (compress) {
- gzip.reset(new GzipOutputStream(*os));
+ gzip = std::make_unique<GzipOutputStream>(*os);
os = gzip.get();
}
#endif
diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx
index a79f0997b..77751167f 100644
--- a/src/decoder/plugins/WavpackDecoderPlugin.cxx
+++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx
@@ -544,7 +544,7 @@ wavpack_streamdecode(DecoderClient &client, InputStream &is)
open_flags |= OPEN_WVC;
can_seek &= is_wvc->IsSeekable();
- wvc.reset(new WavpackInput(&client, *is_wvc));
+ wvc = std::make_unique<WavpackInput>(&client, *is_wvc);
}
if (!can_seek) {