summaryrefslogtreecommitdiff
path: root/src/wx/audio_mapping_view.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/audio_mapping_view.cc
parent92364afecf76a87e1f96980cb1b91cf6f6a7522c (diff)
Use libdcp's warnings.h
Diffstat (limited to 'src/wx/audio_mapping_view.cc')
-rw-r--r--src/wx/audio_mapping_view.cc14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 81fa1a70d..8818deb63 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -29,19 +29,17 @@
#include "wx_util.h"
#include "lib/audio_mapping.h"
#include "lib/maths_util.h"
-#include "lib/warnings.h"
#include <dcp/locale_convert.h>
#include <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-#include <wx/renderer.h>
-#include <wx/grid.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+#include <wx/grid.h>
+#include <wx/renderer.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
-using std::cout;
using std::list;
using std::make_pair;
using std::max;