From: Carl Hetherington <cth@carlh.net>
Date: Sat, 23 May 2015 16:25:01 +0000 (+0100)
Subject: Put our version of compose.hpp inside the libdcp namespace,
X-Git-Tag: v1.1.0~61
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=757b54ac63631bb490ac70812e928045b95874f1;p=libdcp.git

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 b3f410c8..f7bd4282 100644
--- 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