Move some includes.

[stg.git] / stargazer / plugins / store / firebird / firebird_store_admins.cpp

diff --git a/stargazer/plugins/store/firebird/firebird_store_admins.cpp b/stargazer/plugins/store/firebird/firebird_store_admins.cpp
index e794d2062f9adec50ff9e76eaae2bb22ddc7e7fa..bb0bc0f425848622dbe7036efe2513131864be53 100644 (file)
--- a/stargazer/plugins/store/firebird/firebird_store_admins.cpp
+++ b/stargazer/plugins/store/firebird/firebird_store_admins.cpp
@@ -26,12 +26,15 @@
  *
  */
 
  *
  */
 

-#include <string>
-#include <vector>
-

 #include "firebird_store.h"
 #include "firebird_store.h"

+

 #include "stg/ibpp.h"
 #include "stg/ibpp.h"

+#include "stg/admin_conf.h"

 #include "stg/blowfish.h"
 #include "stg/blowfish.h"

+#include "stg/common.h"
+
+#include <string>
+#include <vector>

 
 #define adm_enc_passwd "cjeifY8m3"
 
 
 #define adm_enc_passwd "cjeifY8m3"
 


@@ -68,7 +71,7 @@ catch (IBPP::Exception & ex)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int FIREBIRD_STORE::SaveAdmin(const ADMIN_CONF & ac) const
+int FIREBIRD_STORE::SaveAdmin(const STG::AdminConf & ac) const

 {
 STG_LOCKER lock(&mutex);
 
 {
 STG_LOCKER lock(&mutex);
 


@@ -126,7 +129,7 @@ catch (IBPP::Exception & ex)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int FIREBIRD_STORE::RestoreAdmin(ADMIN_CONF * ac, const std::string & login) const
+int FIREBIRD_STORE::RestoreAdmin(STG::AdminConf * ac, const std::string & login) const

 {
 STG_LOCKER lock(&mutex);
 
 {
 STG_LOCKER lock(&mutex);