diff options
author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
---|---|---|
committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
commit | e55b0d8a97d0be6be188d5d13f675da935c039ef (patch) | |
tree | ce9d7834fc75cd1c072bceff614ef3b1eb39052c /src/libaudcore/probe-buffer.cc | |
parent | df5213d83c2bf1abd97568cef5a1a763bc425926 (diff) | |
parent | 66d524c01720835a30716cb6861606f95629faea (diff) |
fix conflict
Diffstat (limited to 'src/libaudcore/probe-buffer.cc')
-rw-r--r-- | src/libaudcore/probe-buffer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libaudcore/probe-buffer.cc b/src/libaudcore/probe-buffer.cc index 0ea6d6b..e23992c 100644 --- a/src/libaudcore/probe-buffer.cc +++ b/src/libaudcore/probe-buffer.cc @@ -24,9 +24,9 @@ static constexpr int MAXBUF = 256 * 1024; -ProbeBuffer::ProbeBuffer (const char * filename, SmartPtr<VFSImpl> && file) : +ProbeBuffer::ProbeBuffer (const char * filename, VFSImpl * file) : m_filename (filename), - m_file (std::move (file)) + m_file (file) { AUDINFO ("<%p> buffering enabled for %s\n", this, (const char *) m_filename); } |