From 471dee40c1476aba2ff0cff7a57b31306c50b93e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 16 Apr 2022 23:56:06 +0200 Subject: [PATCH] C++11 tidying. --- src/lib/butler.cc | 16 ++++++++-------- src/wx/video_view.cc | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/butler.cc b/src/lib/butler.cc index de6a65126..27b39ba4f 100644 --- 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 1c645f11f..ac6357e62 100644 --- 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(); + return {}; } auto const next = position() + one_video_frame(); -- 2.30.2