diff base/RealTime.cpp @ 843:e802e550a1f2

Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author Chris Cannam
date Tue, 26 Nov 2013 13:35:08 +0000
parents 335c3f922327
children 0f363d0fbdc3
line wrap: on
line diff
--- a/base/RealTime.cpp	Tue Nov 26 11:16:37 2013 +0000
+++ b/base/RealTime.cpp	Tue Nov 26 13:35:08 2013 +0000
@@ -23,12 +23,11 @@
 #include <cstdlib>
 #include <sstream>
 
-using std::cerr;
-using std::endl;
-
 #include "RealTime.h"
 #include "sys/time.h"
 
+#include "Debug.h"
+
 #include "Preferences.h"
 
 // A RealTime consists of two ints that must be at least 32 bits each.
@@ -129,12 +128,12 @@
     }
 
     if (year > 0) {
-        std::cerr << "WARNING: This xsd:duration (\"" << xsdd << "\") contains a non-zero year.\nWith no origin and a limited data size, I will treat a year as exactly 31556952\nseconds and you should expect overflow and/or poor results." << std::endl;
+        cerr << "WARNING: This xsd:duration (\"" << xsdd << "\") contains a non-zero year.\nWith no origin and a limited data size, I will treat a year as exactly 31556952\nseconds and you should expect overflow and/or poor results." << endl;
         t = t + RealTime(year * 31556952, 0);
     }
 
     if (month > 0) {
-        std::cerr << "WARNING: This xsd:duration (\"" << xsdd << "\") contains a non-zero month.\nWith no origin and a limited data size, I will treat a month as exactly 2629746\nseconds and you should expect overflow and/or poor results." << std::endl;
+        cerr << "WARNING: This xsd:duration (\"" << xsdd << "\") contains a non-zero month.\nWith no origin and a limited data size, I will treat a month as exactly 2629746\nseconds and you should expect overflow and/or poor results." << endl;
         t = t + RealTime(month * 2629746, 0);
     }
 
@@ -341,7 +340,7 @@
 
     out << ":";
 
-//    std::cerr << "div = " << div << ", f =  "<< f << std::endl;
+//    cerr << "div = " << div << ", f =  "<< f << endl;
 
     while (div) {
         int d = (f / div) % 10;
@@ -351,7 +350,7 @@
 	
     std::string s = out.str();
 
-//    std::cerr << "converted " << toString() << " to " << s << std::endl;
+//    cerr << "converted " << toString() << " to " << s << endl;
 
     return s;
 }