projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
b5c373a
)
Try to fix OS X compile failure.
author
Carl Hetherington
<cth@carlh.net>
Sat, 17 Aug 2013 22:46:01 +0000
(23:46 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 17 Aug 2013 22:46:01 +0000
(23:46 +0100)
src/lib/colour_conversion.h
patch
|
blob
|
history
diff --git
a/src/lib/colour_conversion.h
b/src/lib/colour_conversion.h
index 85d951ce169dadb48f602f93d9c9d5990d1e145c..f6b5bc9f34f74f8022ffcfe7a67ff53e952a1e31 100644
(file)
--- a/
src/lib/colour_conversion.h
+++ b/
src/lib/colour_conversion.h
@@
-20,6
+20,11
@@
#ifndef DCPOMATIC_COLOUR_CONVERSION_H
#define DCPOMATIC_COLOUR_CONVERSION_H
+/* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
+#ifdef check
+#undef check
+#endif
+
#include <boost/utility.hpp>
#include <boost/optional.hpp>
#include <boost/numeric/ublas/matrix.hpp>