X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.h;h=897b725bd3e63587ba9390f194234847e01aedd1;hp=a09dd93e9c179f515b08bfd093f8aaada36f2937;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=f0957fd41d1915b8046dc0c2aeb662e1e8c288c7

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index a09dd93e9..897b725bd 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -35,8 +35,13 @@
 #include <iomanip>
 #include <cstdio>
 
+struct dcpomatic_time_ceil_test;
+struct dcpomatic_time_floor_test;
+
+namespace dcpomatic {
+
 /** A time in seconds, expressed as a number scaled up by Time::HZ.  We want two different
- *  versions of this class, ContentTime and DCPTime, and we want it to be impossible to
+ *  versions of this class, dcpomatic::ContentTime and dcpomatic::DCPTime, and we want it to be impossible to
  *  convert implicitly between the two.  Hence there's this template hack.  I'm not
  *  sure if it's the best way to do it.
  *
@@ -228,8 +233,8 @@ public:
 	static const int HZ = 96000;
 
 private:
-	friend struct dcpomatic_time_ceil_test;
-	friend struct dcpomatic_time_floor_test;
+	friend struct ::dcpomatic_time_ceil_test;
+	friend struct ::dcpomatic_time_floor_test;
 
 	Type _t;
 };
@@ -357,4 +362,6 @@ std::string to_string (ContentTime t);
 std::string to_string (DCPTime t);
 std::string to_string (DCPTimePeriod p);
 
+}
+
 #endif