Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / authorization / ao / ao.h

diff --git a/projects/stargazer/plugins/authorization/ao/ao.h b/projects/stargazer/plugins/authorization/ao/ao.h
index 5d17cbffff44c650a38f001d14739107bf6b25f7..205ebf5a841a5eded5e9d1bc40d86faa8c2ce9da 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -46,10 +46,11 @@ class USERS;
 template <typename T>
 class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:
 template <typename T>
 class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:

-                CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
+                CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u)
+                    : PROPERTY_NOTIFIER_BASE<T>(), user(u), auth(a) {}

                 CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER<T> & rvalue)
                 CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER<T> & rvalue)

-                    : user(rvalue.user), auth(rvalue.auth)
-                {}
+                    : PROPERTY_NOTIFIER_BASE<T>(),
+                      user(rvalue.user), auth(rvalue.auth) {}

     void        Notify(const T & oldValue, const T & newValue);
     USER_PTR    GetUser() const { return user; }
 
     void        Notify(const T & oldValue, const T & newValue);
     USER_PTR    GetUser() const { return user; }
 


@@ -63,10 +64,11 @@ private:
 template <typename T>
 class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:
 template <typename T>
 class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:

-                CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
+                CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u)
+                    : PROPERTY_NOTIFIER_BASE<T>(), user(u), auth(a) {}

                 CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER<T> & rvalue)
                 CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER<T> & rvalue)

-                    : user(rvalue.user), auth(rvalue.auth)
-                {}
+                    : PROPERTY_NOTIFIER_BASE<T>(),
+                      user(rvalue.user), auth(rvalue.auth) {}

     void        Notify(const T & oldValue, const T & newValue);
     USER_PTR    GetUser() const { return user; }
 
     void        Notify(const T & oldValue, const T & newValue);
     USER_PTR    GetUser() const { return user; }
 


@@ -92,8 +94,8 @@ public:
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const;

-    uint16_t            GetStartPosition() const { return 70; }
-    uint16_t            GetStopPosition() const { return 70; }
+    uint16_t            GetStartPosition() const { return 30; }
+    uint16_t            GetStopPosition() const { return 30; }

 
     void                AddUser(USER_PTR u);
     void                DelUser(USER_PTR u);
 
     void                AddUser(USER_PTR u);
     void                DelUser(USER_PTR u);