Use libdcp's warnings.h

[dcpomatic.git] / src / wx / dkdm_output_panel.h

diff --git a/src/wx/dkdm_output_panel.h b/src/wx/dkdm_output_panel.h
index 4f0ad12b6060e07aac17828f271f8d4eea92cf97..297c318876e90eda8e275cfb0953776191a05214 100644 (file)
--- a/src/wx/dkdm_output_panel.h
+++ b/src/wx/dkdm_output_panel.h
@@ -18,19 +18,25 @@
 
 */
 
-#include "lib/kdm_with_metadata.h"
-#include "wx_util.h"
+
 #include "name_format_editor.h"
+#include "wx_util.h"
+#include "lib/kdm_with_metadata.h"
 #include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
-class wxRadioButton;
-class wxDirPickerCtrl;
+
 class DirPickerCtrl;
-class KDMTimingPanel;
 class Job;
+class KDMTimingPanel;
 class Log;
+class wxDirPickerCtrl;
+class wxRadioButton;
+
 
 class DKDMOutputPanel : public wxPanel
 {
@@ -41,10 +47,10 @@ public:
 
        boost::filesystem::path directory () const;
 
-       std::pair<boost::shared_ptr<Job>, int> make (
+       std::pair<std::shared_ptr<Job>, int> make (
                std::list<KDMWithMetadataPtr > kdms,
                std::string name,
-               boost::function<bool (boost::filesystem::path)> confirm_overwrite
+               std::function<bool (boost::filesystem::path)> confirm_overwrite
                );
 
 private: