Виправлено помилки компілязції під FreeBSD4

[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 f2912d14746ba36b6b2524e2353e39c44344b03a..2a9ff3e0a52c129f49a984d578ab6b965fdfc1fc 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -45,28 +45,30 @@ template <typename varParamType>
 class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
 {
 public:
 class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
 {
 public:

+                CHG_BEFORE_NOTIFIER(AUTH_AO & a, user_iter u) : user(u), auth(a) {}

     void        Notify(const varParamType & oldValue, const varParamType & newValue);
     void        Notify(const varParamType & oldValue, const varParamType & newValue);

-    void        SetUser(user_iter u) { user = u; }
+    //void        SetUser(user_iter u) { user = u; }

     user_iter   GetUser() {return user; }
     user_iter   GetUser() {return user; }

-    void        SetAuthorizator(const AUTH_AO * a) { auth = a; }
+    //void        SetAuthorizator(const AUTH_AO * a) { auth = a; }

 
 private:
     user_iter   user;
 
 private:
     user_iter   user;

-    const       AUTH_AO * auth;
+    const       AUTH_AO & auth;

 };
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
 {
 public:
 };
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
 {
 public:

+                CHG_AFTER_NOTIFIER(AUTH_AO & a, user_iter u) : user(u), auth(a) {}

     void        Notify(const varParamType & oldValue, const varParamType & newValue);
     void        Notify(const varParamType & oldValue, const varParamType & newValue);

-    void        SetUser(user_iter u) { user = u; }
+    //void        SetUser(user_iter u) { user = u; }

     user_iter   GetUser() {return user; }
     user_iter   GetUser() {return user; }

-    void        SetAuthorizator(const AUTH_AO * a) { auth = a; }
+    //void        SetAuthorizator(const AUTH_AO * a) { auth = a; }

 
 private:
     user_iter   user;
 
 private:
     user_iter   user;

-    const AUTH_AO * auth;
+    const AUTH_AO & auth;

 };
 //-----------------------------------------------------------------------------
 class AUTH_AO_SETTINGS
 };
 //-----------------------------------------------------------------------------
 class AUTH_AO_SETTINGS


@@ -136,33 +138,33 @@ private:
     class ADD_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
     {
     public:
     class ADD_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
     {
     public:

-        ADD_USER_NONIFIER(){};
+        ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {};

         virtual ~ADD_USER_NONIFIER(){};
 
         virtual ~ADD_USER_NONIFIER(){};
 

-        void SetAuthorizator(AUTH_AO * a) { auth = a; }
+        //void SetAuthorizator(AUTH_AO * a) { auth = a; }

         void Notify(const user_iter & user)
             {
         void Notify(const user_iter & user)
             {

-            auth->AddUser(user);
+            auth.AddUser(user);

             }
 
     private:
             }
 
     private:

-        AUTH_AO * auth;
+        AUTH_AO & auth;

     } onAddUserNotifier;
 
     class DEL_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
     {
     public:
     } onAddUserNotifier;
 
     class DEL_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
     {
     public:

-        DEL_USER_NONIFIER(){};
+        DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {};

         virtual ~DEL_USER_NONIFIER(){};
 
         virtual ~DEL_USER_NONIFIER(){};
 

-        void SetAuthorizator(AUTH_AO * a) { auth = a; }
+        //void SetAuthorizator(AUTH_AO * a) { auth = a; }

         void Notify(const user_iter & user)
             {
         void Notify(const user_iter & user)
             {

-            auth->DelUser(user);
+            auth.DelUser(user);

             }
 
     private:
             }
 
     private:

-        AUTH_AO * auth;
+        AUTH_AO & auth;

     } onDelUserNotifier;
 
 };
     } onDelUserNotifier;
 
 };