summaryrefslogtreecommitdiff
path: root/src/wx/config_dialog.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-04-22 23:27:15 +0200
committerCarl Hetherington <cth@carlh.net>2022-04-22 23:27:15 +0200
commit3c29aa6531a4046a8db72dcac81189eb8893233c (patch)
treece2a134dab63df1711a135ae5732839ff293d958 /src/wx/config_dialog.cc
parent92364afecf76a87e1f96980cb1b91cf6f6a7522c (diff)
Use libdcp's warnings.h
Diffstat (limited to 'src/wx/config_dialog.cc')
-rw-r--r--src/wx/config_dialog.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index f91ebe670..08e2721da 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -25,22 +25,23 @@
#include "dcpomatic_button.h"
#include "audio_mapping_view.h"
#include <dcp/raw_convert.h>
-#include <iostream>
-using std::string;
-using std::vector;
-using std::pair;
+
+using std::function;
using std::make_pair;
-using std::map;
using std::make_shared;
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+using std::vector;
using boost::bind;
using boost::optional;
-using std::shared_ptr;
-using std::function;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
+
static
bool
do_nothing ()