diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-22 11:57:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-22 11:57:46 +0100 |
| commit | 3b3a6c03660b2d3ca8c297d4dde8032dc1afd236 (patch) | |
| tree | 8be9bd5330f413b05fd0e6500326f8c616fbf34a /src/compose.hpp | |
| parent | aab44464cc78bec4c54d2c26448b568b52970637 (diff) | |
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.
Diffstat (limited to 'src/compose.hpp')
| -rw-r--r-- | src/compose.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 |