projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work around symbol clash with ERROR on Win32/mingw.
[libdcp.git]
/
src
/
mxf.cc
diff --git
a/src/mxf.cc
b/src/mxf.cc
index dd4d2efcbb1b87c57636674c186650a82bd38f12..def53c15b9c21512965b5fcbf00ffec97b7813d8 100644
(file)
--- a/
src/mxf.cc
+++ b/
src/mxf.cc
@@
-98,12
+98,12
@@
MXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::functi
shared_ptr<const MXF> other_mxf = dynamic_pointer_cast<const MXF> (other);
if (!other_mxf) {
shared_ptr<const MXF> other_mxf = dynamic_pointer_cast<const MXF> (other);
if (!other_mxf) {
- note (ERROR, "comparing an MXF asset with a non-MXF asset");
+ note (
DCP_
ERROR, "comparing an MXF asset with a non-MXF asset");
return false;
}
if (_file != other_mxf->file ()) {
return false;
}
if (_file != other_mxf->file ()) {
- note (ERROR, "MXF names differ");
+ note (
DCP_
ERROR, "MXF names differ");
if (!opt.mxf_names_can_differ) {
return false;
}
if (!opt.mxf_names_can_differ) {
return false;
}