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
/
lib
/
cross_common.cc
diff --git
a/src/lib/cross_common.cc
b/src/lib/cross_common.cc
index 9f42610bdc8acc53069467bb8ba9f1821aea7c47..d313445da906bbf3786d2130674cb3f826549720 100644
(file)
--- a/
src/lib/cross_common.cc
+++ b/
src/lib/cross_common.cc
@@
-23,11
+23,11
@@
#include "compose.hpp"
#include "dcpomatic_assert.h"
#include "dcpomatic_log.h"
#include "compose.hpp"
#include "dcpomatic_assert.h"
#include "dcpomatic_log.h"
-#include "warnings.h"
#include <dcp/raw_convert.h>
#include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <boost/algorithm/string.hpp>
#include <iostream>
#include <boost/algorithm/string.hpp>
#include <iostream>