Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / src / lib / dcpomatic_time.h

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index a0bbad06aeaeeed6530d214551fcbd82ab3a4d4d..55476d5b52ad6d5752344dd9a23b70d5f3770fe8 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -26,6 +26,7 @@
 #include <iomanip>
 #include <stdint.h>
 #include "frame_rate_change.h"
+#include "safe_stringstream.h"
 
 class dcpomatic_round_up_test;
 
@@ -86,7 +87,7 @@ public:
                int f;
                split (r, h, m, s, f);
 
-               std::ostringstream o;
+               SafeStringStream o;
                o.width (2);
                o.fill ('0');
                o << std::setw(2) << std::setfill('0') << h << ":"
@@ -97,7 +98,7 @@ public:
        }
 
 protected:
-       friend class dcptime_round_up_test;
+       friend struct dcptime_round_up_test;
        
        Type _t;
        static const int HZ = 96000;