diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-23 17:25:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-23 17:25:01 +0100 |
| commit | 757b54ac63631bb490ac70812e928045b95874f1 (patch) | |
| tree | bf895fb1512a1af353c6871547d2548c61fa22d9 /src | |
| parent | 520dcd6fc97917ed437c6fc91042e7ee858318f2 (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')
| -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..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 |