Merge branch 'master' into otio_improvments

app/common/rational.cpp

@@ -3,7 +3,7 @@
 
 #include "rational.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 rational rational::fromDouble(const double &flt)
 {
@@ -393,9 +393,9 @@ uint qHash(const rational &r, uint seed)
   return ::qHash(r.toDouble(), seed);
 }
 
-OLIVE_NAMESPACE_EXIT
+}
 
-QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational &r)
+QDebug operator<<(QDebug debug, const olive::rational &r)
 {
   return debug.space() << r.toDouble();
   /*