summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-04 00:40:56 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-04 00:40:56 +0200
commit8e1b0dfe3103867a749ff51156e3ed6547f298a0 (patch)
tree4505f503c3a19b9f4aabe31285d23a9d64aa539d /src
parentadcf6f9adcd8b33fd6f3cf0e5b00a4a4db183002 (diff)
More disk build fixes.
Diffstat (limited to 'src')
-rw-r--r--src/tools/dcpomatic_disk.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 5ae5cfb92..88f5420ee 100644
--- 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,