summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/butler.cc16
1 files changed, 8 insertions, 8 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;