From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sun, 20 Oct 2013 10:46:13 +0000 (+0300)
Subject: Fixed compilation issues.
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/3648fc30af7a06fa7fbc0c70ee04dfb05b5ccf21?ds=sidebyside;hp=2d0dedb8abc45c661e35e729b5ff71724d4d749a

Fixed compilation issues.
---

diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index f2afda39..2a2dbcaa 100644
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -49,7 +49,7 @@ public:
 
     int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data);
 
-    int GetAdmins(GET_ADMINS::CALLBACK f, void * data);
+    int GetAdmins(GET_CONTAINER::CALLBACK<GET_ADMIN::INFO>::TYPE f, void * data);
     int GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data);
     int ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddAdmin(const std::string & login,
@@ -57,7 +57,7 @@ public:
                  SIMPLE::CALLBACK f, void * data);
     int DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data);
 
-    int GetTariffs(GET_TARIFFS::CALLBACK f, void * data);
+    int GetTariffs(GET_CONTAINER::CALLBACK<GET_TARIFF::INFO>::TYPE f, void * data);
     int GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data);
     int ChgTariff(const TARIFF_DATA_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddTariff(const std::string & name,
@@ -65,7 +65,7 @@ public:
                   SIMPLE::CALLBACK f, void * data);
     int DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data);
 
-    int GetUsers(GET_USERS::CALLBACK f, void * data);
+    int GetUsers(GET_CONTAINER::CALLBACK<GET_USER::INFO>::TYPE f, void * data);
     int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data);
     int ChgUser(const std::string & login,
                 const USER_CONF_RES & conf,
@@ -77,7 +77,7 @@ public:
     int SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data);
     int CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data);
 
-    int GetServices(GET_SERVICES::CALLBACK f, void * data);
+    int GetServices(GET_CONTAINER::CALLBACK<GET_SERVICE::INFO>::TYPE f, void * data);
     int GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data);
     int ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddService(const std::string & name,
@@ -85,7 +85,7 @@ public:
                    SIMPLE::CALLBACK f, void * data);
     int DelService(const std::string & name, SIMPLE::CALLBACK f, void * data);
 
-    int GetCorporations(GET_CORPORATIONS::CALLBACK f, void * data);
+    int GetCorporations(GET_CONTAINER::CALLBACK<GET_CORP::INFO>::TYPE f, void * data);
     int GetCorp(const std::string & name, GET_CORP::CALLBACK f, void * data);
     int ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddCorp(const std::string & name,
diff --git a/stglibs/srvconf.lib/include/stg/servconf_types.h b/stglibs/srvconf.lib/include/stg/servconf_types.h
index 98add644..f323e99e 100644
--- a/stglibs/srvconf.lib/include/stg/servconf_types.h
+++ b/stglibs/srvconf.lib/include/stg/servconf_types.h
@@ -77,6 +77,17 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, void * data);
 
 } // namespace SIMPLE
 
+namespace GET_CONTAINER
+{
+
+template <typename INFO>
+struct CALLBACK
+{
+typedef void (* TYPE)(bool result, const std::string & reason, const std::vector<INFO> & info, void * data);
+};
+
+}
+
 namespace AUTH_BY
 {
 
@@ -152,14 +163,6 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 } // namespace GET_USER
 
-namespace GET_USERS
-{
-
-typedef std::vector<GET_USER::INFO> INFO;
-typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
-
-} // namespace GET_USERS
-
 namespace GET_ADMIN
 {
 
@@ -168,14 +171,6 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_ADMINS
-{
-
-typedef std::vector<GET_ADMIN::INFO> INFO;
-typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
-
-}
-
 namespace GET_TARIFF
 {
 
@@ -184,14 +179,6 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_TARIFFS
-{
-
-typedef std::vector<GET_TARIFF::INFO> INFO;
-typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
-
-}
-
 namespace GET_SERVICE
 {
 
@@ -200,14 +187,6 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_SERVICES
-{
-
-typedef std::vector<GET_SERVICE::INFO> INFO;
-typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
-
-}
-
 namespace GET_CORP
 {
 
@@ -216,14 +195,6 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_CORPORATIONS
-{
-
-typedef std::vector<GET_CORP::INFO> INFO;
-typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
-
-}
-
 } // namespace STG
 
 #endif
diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index a9881f05..ab8e5e79 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -137,7 +137,7 @@ return pImpl->RawXML(request, f, data);
 
 // -- Admins --
 
-int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data)
+int SERVCONF::GetAdmins(GET_CONTAINER::CALLBACK<GET_ADMIN::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_ADMIN::PARSER> >("admins", "<GetAdmins/>", f, data);
 }
@@ -169,7 +169,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelAdmin", "<DelAdmin login=\"" + login + "\
 
 // -- Tariffs --
 
-int SERVCONF::GetTariffs(GET_TARIFFS::CALLBACK f, void * data)
+int SERVCONF::GetTariffs(GET_CONTAINER::CALLBACK<GET_TARIFF::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_TARIFF::PARSER> >("tariffs", "<GetTariffs/>", f, data);
 }
@@ -201,7 +201,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelTariff", "<DelTariff name=\"" + name + "\
 
 // -- Users --
 
-int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)
+int SERVCONF::GetUsers(GET_CONTAINER::CALLBACK<GET_USER::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_USER::PARSER> >("users", "<GetUsers/>", f, data);
 }
@@ -246,7 +246,7 @@ return pImpl->Exec<SIMPLE::PARSER>("CheckUser", "<CheckUser login=\"" + login +
 
 // -- Services --
 
-int SERVCONF::GetServices(GET_SERVICES::CALLBACK f, void * data)
+int SERVCONF::GetServices(GET_CONTAINER::CALLBACK<GET_SERVICE::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_SERVICE::PARSER> >("services", "<GetServices/>", f, data);
 }
@@ -278,7 +278,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelService", "<DelService name=\"" + name +
 
 // -- Corporations --
 
-int SERVCONF::GetCorporations(GET_CORPORATIONS::CALLBACK f, void * data)
+int SERVCONF::GetCorporations(GET_CONTAINER::CALLBACK<GET_CORP::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_CORP::PARSER> >("corporations", "<GetCorporations/>", f, data);
 }