From 7bca4c05ca38b218c252b0fe98a866806d9a2ded Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 13 Jun 2014 12:51:48 +0100 Subject: Work around symbol clash with ERROR on Win32/mingw. --- src/reel.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/reel.cc') 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 other, EqualityOptions opt, boost::function 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 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 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; } -- cgit v1.2.3