TEST_SETTINGS_LOCAL moved outside the namespace, more assertions added

[stg.git] / projects / stargazer / admins_impl.h

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index 8318fc214aa295b9f7d5867eb064ba3dc0cb74bd..170f3a4f3cb74a01ea9fcbb648fc5b94fe4ab6a7 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -32,33 +32,34 @@
 #define ADMINS_IMPL_H
 
 #include <pthread.h>
 #define ADMINS_IMPL_H
 
 #include <pthread.h>

+

 #include <list>
 #include <map>
 
 #include <list>
 #include <map>
 

-#include "admins.h"
-#include "admin.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/locker.h"
+#include "stg/store.h"
+#include "stg/noncopyable.h"

 #include "admin_impl.h"
 #include "admin_impl.h"

-#include "stg_locker.h"
-#include "base_store.h"
-#include "noncopyable.h"

 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:

-    ADMINS_IMPL(BASE_STORE * st);
-    virtual ~ADMINS_IMPL() {};
+    ADMINS_IMPL(STORE * st);
+    virtual ~ADMINS_IMPL() {}

 
 

-    int           Add(const string & login, const ADMIN & admin);
-    int           Del(const string & login, const ADMIN & admin);
-    int           Change(const ADMIN_CONF & ac, const ADMIN & admin);
+    int           Add(const string & login, const ADMIN * admin);
+    int           Del(const string & login, const ADMIN * admin);
+    int           Change(const ADMIN_CONF & ac, const ADMIN * admin);

     void          PrintAdmins() const;
     void          PrintAdmins() const;

-    const ADMIN * GetSysAdmin() const { return &stg; };
-    const ADMIN * GetNoAdmin() const { return &noAdmin; };
+    const ADMIN * GetSysAdmin() const { return &stg; }
+    const ADMIN * GetNoAdmin() const { return &noAdmin; }

     bool          FindAdmin(const std::string & l, ADMIN ** admin);
     bool          AdminExists(const std::string & login) const;
     bool          AdminCorrect(const std::string & login,
                                const std::string & password,
     bool          FindAdmin(const std::string & l, ADMIN ** admin);
     bool          AdminExists(const std::string & login) const;
     bool          AdminCorrect(const std::string & login,
                                const std::string & password,

-                               ADMIN * admin) const;
-    const std::string & GetStrError() const { return strError; };
+                               ADMIN ** admin);
+    const std::string & GetStrError() const { return strError; }

 
     int OpenSearch() const;
     int SearchNext(int, ADMIN_CONF * ac) const;
 
     int OpenSearch() const;
     int SearchNext(int, ADMIN_CONF * ac) const;


@@ -73,11 +74,12 @@ private:
     ADMIN_IMPL           stg;
     ADMIN_IMPL           noAdmin;
     list<ADMIN_IMPL>     data;
     ADMIN_IMPL           stg;
     ADMIN_IMPL           noAdmin;
     list<ADMIN_IMPL>     data;

-    BASE_STORE *    store;
-    STG_LOGGER &    WriteServLog;
+    STORE *              store;
+    STG_LOGGER &         WriteServLog;

     mutable map<int, const_admin_iter> searchDescriptors;
     mutable unsigned int handle;
     mutable pthread_mutex_t mutex;
     mutable map<int, const_admin_iter> searchDescriptors;
     mutable unsigned int handle;
     mutable pthread_mutex_t mutex;

-    std::string     strError;
+    std::string          strError;

 };
 };

+

 #endif
 #endif