pot/merge.

[dcpomatic.git] / src / tools / dcpomatic_disk.cc

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 81db2dd0a473c49361fe948fa05153ec510f4a56..88f5420ee0a045c8693ec5220a54df7a4a8a2669 100644 (file)
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -49,11 +49,12 @@ DCPOMATIC_ENABLE_WARNINGS
 #endif
 
 
-using std::string;
-using std::exception;
-using std::cout;
 using std::cerr;
+using std::cout;
+using std::exception;
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -281,7 +282,7 @@ private:
                        if (!_nanomsg.send(drive.as_xml(), 2000)) {
                                throw CommunicationFailedError ();
                        }
-                       auto <string> reply = _nanomsg.receive (2000);
+                       auto reply = _nanomsg.receive (2000);
                        if (!reply || *reply != DISK_WRITER_OK) {
                                auto * m = new MessageDialog (
                                                this,
@@ -320,7 +321,7 @@ private:
                int j = 0;
                _drives = Drive::get ();
                for (auto i: _drives) {
-                       auto const s = std_to_wx(i.description();
+                       auto const s = std_to_wx(i.description());
                        if (s == current) {
                                re_select = j;
                        }