summaryrefslogtreecommitdiff
path: root/src/cpl.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-13 12:51:48 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-13 12:51:48 +0100
commit7bca4c05ca38b218c252b0fe98a866806d9a2ded (patch)
tree959c021c95049e3a064f3a7b377d26d78c9cc4a3 /src/cpl.cc
parent4c8229e08772f498f1ece36fff51c0be8cf3636c (diff)
Work around symbol clash with ERROR on Win32/mingw.
Diffstat (limited to 'src/cpl.cc')
-rw-r--r--src/cpl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpl.cc b/src/cpl.cc
index fcfa9efa..535fd77f 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -179,17 +179,17 @@ CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteT
if (_annotation_text != other._annotation_text && !opt.cpl_annotation_texts_can_differ) {
stringstream s;
s << "annotation texts differ: " << _annotation_text << " vs " << other._annotation_text << "\n";
- note (ERROR, s.str ());
+ note (DCP_ERROR, s.str ());
return false;
}
if (_content_kind != other._content_kind) {
- note (ERROR, "content kinds differ");
+ note (DCP_ERROR, "content kinds differ");
return false;
}
if (_reels.size() != other._reels.size()) {
- note (ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
+ note (DCP_ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
return false;
}