Merge branch 'new-daily-fee'

[stg.git] / stglibs / srvconf.lib / include / stg / servconf_types.h

diff --git a/stglibs/srvconf.lib/include/stg/servconf_types.h b/stglibs/srvconf.lib/include/stg/servconf_types.h
index 6f454bc365d72d7788065f61018611116dc62a7b..f323e99e95a96325f10d09b89c2e466d0ba77dc9 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf_types.h
+++ b/stglibs/srvconf.lib/include/stg/servconf_types.h
@@ -41,6 +41,7 @@
 struct ADMIN_CONF;
 struct TARIFF_DATA;
 struct SERVICE_CONF;
+struct CORP_CONF;
 
 namespace STG
 {
@@ -76,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
 {
 
@@ -151,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
 {
 
@@ -167,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
 {
 
@@ -183,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
 {
 
@@ -199,10 +187,10 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_SERVICES
+namespace GET_CORP
 {
 
-typedef std::vector<GET_SERVICE::INFO> INFO;
+typedef CORP_CONF INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }