C++11 tidying.

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index de6a6512649ac1a31543736fdb8fa5b3cebadedc..27b39ba4fb13b3a3bae76963f9f42b56472309fe 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -20,25 +20,25 @@
 
 
 #include "butler.h"
-#include "player.h"
-#include "util.h"
-#include "log.h"
-#include "dcpomatic_log.h"
-#include "cross.h"
 #include "compose.hpp"
+#include "cross.h"
+#include "dcpomatic_log.h"
 #include "exceptions.h"
+#include "log.h"
+#include "player.h"
+#include "util.h"
 #include "video_content.h"
 
 
 using std::cout;
-using std::pair;
+using std::function;
 using std::make_pair;
+using std::pair;
+using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
-using std::shared_ptr;
 using boost::bind;
 using boost::optional;
-using std::function;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 1c645f11f688bd6adab4924c07ad9b0fcd25811c..ac6357e62444ae805b28d4a21116762fd35b6133 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -111,7 +111,7 @@ VideoView::time_until_next_frame () const
 {
        if (length() == dcpomatic::DCPTime()) {
                /* There's no content, so this doesn't matter */
-               return optional<int>();
+               return {};
        }
 
        auto const next = position() + one_video_frame();