Put our version of compose.hpp inside the libdcp namespace,

otherwise libdcp will end up calling DCP-o-matic's version
on OS X, with bad results.

diff --git a/src/compose.hpp b/src/compose.hpp
index b3f410c8ea52345112dc911671fe6756cbde9554..f7bd4282fb398c901db8091697ffa5db772a43c1 100644 (file)
--- a/src/compose.hpp
+++ b/src/compose.hpp
@@ -38,6 +38,8 @@
 #include <list>
 #include <map>                 // for multimap
 
+namespace dcp {
+
 namespace StringPrivate
 {
   // the actual composition class - using string::compose is cleaner, so we
@@ -389,5 +391,6 @@ namespace String
   }
 }
 
+}
 
 #endif // STRING_COMPOSE_H