]> git.stg.codes - stg.git/blobdiff - include/stg/user_property.h
Merge branch 'master' into full-month-stats
[stg.git] / include / stg / user_property.h
index 9030d37fa459af8c2fc2299602d1a52ab8dba4b9..2ff8909cdc25331ef800d40b7ee61d355432d16b 100644 (file)
@@ -24,7 +24,7 @@ $Author: faust $
 #include "notifer.h"
 #include "noncopyable.h"
 
 #include "notifer.h"
 #include "noncopyable.h"
 
-extern const volatile time_t stgTime;
+extern volatile time_t stgTime;
 
 //-----------------------------------------------------------------------------
 template<typename varT>
 
 //-----------------------------------------------------------------------------
 template<typename varT>
@@ -295,8 +295,8 @@ if ((priv->userConf && !isStat) ||
     std::stringstream oldVal;
     std::stringstream newVal;
 
     std::stringstream oldVal;
     std::stringstream newVal;
 
-    oldVal.flags(oldVal.flags() | ios::fixed);
-    newVal.flags(newVal.flags() | ios::fixed);
+    oldVal.flags(oldVal.flags() | std::ios::fixed);
+    newVal.flags(newVal.flags() | std::ios::fixed);
 
     oldVal << USER_PROPERTY<varT>::ConstData();
     newVal << val;
 
     oldVal << USER_PROPERTY<varT>::ConstData();
     newVal << val;
@@ -377,7 +377,7 @@ else
 //-------------------------------------------------------------------------
 template<typename varT>
 inline
 //-------------------------------------------------------------------------
 template<typename varT>
 inline
-ostream & operator<< (ostream & stream, const USER_PROPERTY<varT> & value)
+std::ostream & operator<< (std::ostream & stream, const USER_PROPERTY<varT> & value)
 {
 return stream << value.ConstData();
 }
 {
 return stream << value.ConstData();
 }