From 3b3a6c03660b2d3ca8c297d4dde8032dc1afd236 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 22 Apr 2015 11:57:46 +0100
Subject: 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.

---
 src/compose.hpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/compose.hpp b/src/compose.hpp
index b3f410c8..1ccf829c 100644
--- a/src/compose.hpp
+++ b/src/compose.hpp
@@ -38,6 +38,8 @@
 #include <list>
 #include <map>			// for multimap
 
+namespace libdcp {
+
 namespace StringPrivate
 {
   // the actual composition class - using string::compose is cleaner, so we
@@ -389,5 +391,6 @@ namespace String
   }
 }
 
+}
 
 #endif // STRING_COMPOSE_H
-- 
cgit v1.2.3