diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-13 12:51:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-13 12:51:48 +0100 |
| commit | 7bca4c05ca38b218c252b0fe98a866806d9a2ded (patch) | |
| tree | 959c021c95049e3a064f3a7b377d26d78c9cc4a3 /src/reel.cc | |
| parent | 4c8229e08772f498f1ece36fff51c0be8cf3636c (diff) | |
Work around symbol clash with ERROR on Win32/mingw.
Diffstat (limited to 'src/reel.cc')
| -rw-r--r-- | src/reel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/reel.cc b/src/reel.cc index 34b520b4..08a0c936 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -98,7 +98,7 @@ bool Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const { if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) { - note (ERROR, "reel has different assets"); + note (DCP_ERROR, "reel has different assets"); return false; } @@ -107,7 +107,7 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::f } if ((_main_sound && !other->_main_sound) || (!_main_sound && other->_main_sound)) { - note (ERROR, "reel has different assets"); + note (DCP_ERROR, "reel has different assets"); return false; } @@ -116,7 +116,7 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::f } if ((_main_subtitle && !other->_main_subtitle) || (!_main_subtitle && other->_main_subtitle)) { - note (ERROR, "reel has different assets"); + note (DCP_ERROR, "reel has different assets"); return false; } |