srvconf refactoring: auth_by, server_info and check_user.

[stg.git] / include / stg / user_property.h

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index fbd6aa4668ed2d351bfc6615badfeff3190aefdb..2ff8909cdc25331ef800d40b7ee61d355432d16b 100644 (file)
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -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>


@@ -43,10 +43,10 @@ public:
     operator const varT&() const throw() { return value; }
 
     void    AddBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n);
     operator const varT&() const throw() { return value; }
 
     void    AddBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n);

-    void    DelBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n);
+    void    DelBeforeNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n);

 
     void    AddAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n);
 
     void    AddAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n);

-    void    DelAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n);
+    void    DelAfterNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n);

 
     time_t  ModificationTime() const throw() { return modificationTime; }
     void    ModifyTime() throw();
 
     time_t  ModificationTime() const throw() { return modificationTime; }
     void    ModifyTime() throw();


@@ -236,10 +236,10 @@ beforeNotifiers.insert(n);
 //-----------------------------------------------------------------------------
 template <typename varT>
 inline
 //-----------------------------------------------------------------------------
 template <typename varT>
 inline

-void USER_PROPERTY<varT>::DelBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
+void USER_PROPERTY<varT>::DelBeforeNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n)

 {
 STG_LOCKER locker(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER locker(&mutex, __FILE__, __LINE__);

-beforeNotifiers.erase(n);
+beforeNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n));

 }
 //-----------------------------------------------------------------------------
 template <typename varT>
 }
 //-----------------------------------------------------------------------------
 template <typename varT>


@@ -252,10 +252,10 @@ afterNotifiers.insert(n);
 //-----------------------------------------------------------------------------
 template <typename varT>
 inline
 //-----------------------------------------------------------------------------
 template <typename varT>
 inline

-void USER_PROPERTY<varT>::DelAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
+void USER_PROPERTY<varT>::DelAfterNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n)

 {
 STG_LOCKER locker(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER locker(&mutex, __FILE__, __LINE__);

-afterNotifiers.erase(n);
+afterNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n));

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -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();
 }