Put our version of compose.hpp inside the dcp 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 faffc41c2a42cfcc36f1281a6a24fded01831cbc..41a4075a86e4d3f5419d90bf5bb7034dc34f476d 100644 (file)
--- a/src/compose.hpp
+++ b/src/compose.hpp
@@ -42,6 +42,8 @@
 #include <inttypes.h>
 #include <cstdio>
 
+namespace dcp {
+
 namespace StringPrivate
 {
   // the actual composition class - using string::compose is cleaner, so we
@@ -388,5 +390,6 @@ namespace String
   }
 }
 
+}
 
 #endif // STRING_COMPOSE_H