diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-10 16:12:38 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-01-10 16:12:38 +0000 |
| commit | ddfec2c5da6aa7e12af41be3b501a9b56e51353e (patch) | |
| tree | 5abfd59ae368bb586590578ac7bbfde6e3f9d976 /src | |
| parent | 568241745673e68031a72739a5e5a73ba3ee20a7 (diff) | |
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.
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 faffc41c..41a4075a 100644 --- 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 |