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
/
simple_video_view.cc
diff --git
a/src/wx/simple_video_view.cc
b/src/wx/simple_video_view.cc
index c6a4f1e74816cd8ec7c43bc5774677206e70adf2..46854653485e5b6643a85ad056f60ff64d5e6012 100644
(file)
--- a/
src/wx/simple_video_view.cc
+++ b/
src/wx/simple_video_view.cc
@@
-26,11
+26,11
@@
#include "lib/butler.h"
#include "lib/dcpomatic_log.h"
#include "lib/image.h"
#include "lib/butler.h"
#include "lib/dcpomatic_log.h"
#include "lib/image.h"
-#include "lib/warnings.h"
#include <dcp/util.h>
#include <dcp/util.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>
#include <boost/bind/bind.hpp>