projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
content_view.cc
diff --git
a/src/wx/content_view.cc
b/src/wx/content_view.cc
index a020f81486f458fbad053f1b541727555cb997c4..f4c9aca9d62009a186b3ae3747de012438084c89 100644
(file)
--- a/
src/wx/content_view.cc
+++ b/
src/wx/content_view.cc
@@
-28,13
+28,13
@@
#include "lib/dcpomatic_assert.h"
#include "lib/examine_content_job.h"
#include "lib/job_manager.h"
#include "lib/dcpomatic_assert.h"
#include "lib/examine_content_job.h"
#include "lib/job_manager.h"
-#include "lib/warnings.h"
#include <dcp/exceptions.h>
#include <dcp/exceptions.h>
+#include <dcp/warnings.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
-
DCPOMATIC
_DISABLE_WARNINGS
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/progdlg.h>
#include <wx/progdlg.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
using std::cout;
using std::cout;