Remove std::list from tariffs.

diff --git a/include/stg/tariffs.h b/include/stg/tariffs.h
index 6a851c5a3979167d25774a595f97cd82a27912bd..51179d2fdf11873ed14f4914e3cff0c6640ec6e5 100644 (file)
--- a/include/stg/tariffs.h
+++ b/include/stg/tariffs.h
@@ -22,7 +22,7 @@
 #define TARIFFS_H
 
 #include <string>
 #define TARIFFS_H
 
 #include <string>

-#include <list>
+#include <vector>

 
 #include "notifer.h"
 
 
 #include "notifer.h"
 


@@ -32,8 +32,6 @@ struct TARIFF_DATA;
 
 class TARIFFS {
 public:
 
 class TARIFFS {
 public:

-    typedef std::list<TARIFF> Tariffs;
-

     virtual ~TARIFFS() {}
     virtual int ReadTariffs () = 0;
     virtual const TARIFF * FindByName(const std::string & name) const = 0;
     virtual ~TARIFFS() {}
     virtual int ReadTariffs () = 0;
     virtual const TARIFF * FindByName(const std::string & name) const = 0;


@@ -48,7 +46,7 @@ public:
     virtual void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
     virtual void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
 
     virtual void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
     virtual void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
 

-    virtual void GetTariffsData(std::list<TARIFF_DATA> * tdl) const = 0;
+    virtual void GetTariffsData(std::vector<TARIFF_DATA> * tdl) const = 0;

 
     virtual size_t Count() const = 0;
 
 
     virtual size_t Count() const = 0;
 

diff --git a/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp b/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
index 77d73b02091d379cca4e85565756ea8f736d58c7..bbb0a5be704ce7f3474475aef15f4bcf973c53b4 100644 (file)
--- a/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
+++ b/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
@@ -107,9 +107,9 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 std::vector<xmlrpc_c::value> tariffsInfo;
 
 
 std::vector<xmlrpc_c::value> tariffsInfo;
 
 

-std::list<TARIFF_DATA> dataList;
+std::vector<TARIFF_DATA> dataList;

 tariffs->GetTariffsData(&dataList);
 tariffs->GetTariffsData(&dataList);

-std::list<TARIFF_DATA>::const_iterator it = dataList.begin();
+auto it = dataList.begin();

 for (; it != dataList.end(); ++it)
     {
     xmlrpc_c::value info;
 for (; it != dataList.end(); ++it)
     {
     xmlrpc_c::value info;

diff --git a/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp b/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp
index dfe6b55212cac49b498222d7889a374718b9d425..ae22cf044d656fbe6c276371752323be10a9836f 100644 (file)
--- a/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp
+++ b/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp
@@ -90,9 +90,9 @@ void GET_TARIFFS::CreateAnswer()
 {
     m_answer = "<Tariffs>";
 
 {
     m_answer = "<Tariffs>";
 

-    std::list<TARIFF_DATA> dataList;
+    std::vector<TARIFF_DATA> dataList;

     m_tariffs.GetTariffsData(&dataList);
     m_tariffs.GetTariffsData(&dataList);

-    std::list<TARIFF_DATA>::const_iterator it = dataList.begin();
+    auto it = dataList.begin();

     for (; it != dataList.end(); ++it)
         {
         m_answer += "<tariff name=\"" + it->tariffConf.name + "\">";
     for (; it != dataList.end(); ++it)
         {
         m_answer += "<tariff name=\"" + it->tariffConf.name + "\">";

diff --git a/stargazer/plugins/other/smux/tables.cpp b/stargazer/plugins/other/smux/tables.cpp
index c3e3ef54c48d870fee774d16ac11e3420b8b67e2..a9b5e8220917c4be6412dbe9d3883ddfe60686c1 100644 (file)
--- a/stargazer/plugins/other/smux/tables.cpp
+++ b/stargazer/plugins/other/smux/tables.cpp
@@ -15,7 +15,7 @@ void TariffUsersTable::UpdateSensors(Sensors & sensors) const
 {
 std::map<std::string, size_t> data;
 
 {
 std::map<std::string, size_t> data;
 

-std::list<TARIFF_DATA> tdl;
+std::vector<TARIFF_DATA> tdl;

 tariffs.GetTariffsData(&tdl);
 std::transform(tdl.begin(),
                tdl.end(),
 tariffs.GetTariffsData(&tdl);
 std::transform(tdl.begin(),
                tdl.end(),

diff --git a/stargazer/tariffs_impl.cpp b/stargazer/tariffs_impl.cpp
index d47ecf8f5e90b68685bbe4d1205efa78d36cb678..c8345eb18cc22f124d2d05af6e9f16efe59b3fa2 100644 (file)
--- a/stargazer/tariffs_impl.cpp
+++ b/stargazer/tariffs_impl.cpp
@@ -99,8 +99,7 @@ if (name == NO_TARIFF_NAME)
     return &noTariff;
 
 STG_LOCKER lock(&mutex);
     return &noTariff;
 
 STG_LOCKER lock(&mutex);

-std::list<TARIFF_IMPL>::const_iterator ti;
-ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));
+const auto ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));

 
 if (ti != tariffs.end())
     return &(*ti);
 
 if (ti != tariffs.end())
     return &(*ti);


@@ -123,8 +122,7 @@ if (!priv->tariffChg)
 
 STG_LOCKER lock(&mutex);
 
 
 STG_LOCKER lock(&mutex);
 

-std::list<TARIFF_IMPL>::iterator ti;
-ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(td.tariffConf.name));
+auto ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(td.tariffConf.name));

 
 if (ti == tariffs.end())
     {
 
 if (ti == tariffs.end())
     {


@@ -166,8 +164,7 @@ TARIFF_DATA td;
     {
     STG_LOCKER lock(&mutex);
 
     {
     STG_LOCKER lock(&mutex);
 

-    std::list<TARIFF_IMPL>::iterator ti;
-    ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));
+    const auto ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));

 
     if (ti == tariffs.end())
         {
 
     if (ti == tariffs.end())
         {


@@ -188,7 +185,7 @@ TARIFF_DATA td;
     tariffs.erase(ti);
     }
 
     tariffs.erase(ti);
     }
 

-std::set<NOTIFIER_BASE<TARIFF_DATA> *>::iterator ni = onDelNotifiers.begin();
+auto ni = onDelNotifiers.begin();

 while (ni != onDelNotifiers.end())
     {
     (*ni)->Notify(td);
 while (ni != onDelNotifiers.end())
     {
     (*ni)->Notify(td);


@@ -217,8 +214,7 @@ if (!priv->tariffChg)
     {
     STG_LOCKER lock(&mutex);
 
     {
     STG_LOCKER lock(&mutex);
 

-    std::list<TARIFF_IMPL>::iterator ti;
-    ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));
+    const auto ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));

 
     if (ti != tariffs.end())
         {
 
     if (ti != tariffs.end())
         {


@@ -238,7 +234,7 @@ if (store->AddTariff(name) < 0)
     }
 
 // Fire all "on add" notifiers
     }
 
 // Fire all "on add" notifiers

-std::set<NOTIFIER_BASE<TARIFF_DATA> *>::iterator ni = onAddNotifiers.begin();
+auto ni = onAddNotifiers.begin();

 while (ni != onAddNotifiers.end())
     {
     (*ni)->Notify(tariffs.back().GetTariffData());
 while (ni != onAddNotifiers.end())
     {
     (*ni)->Notify(tariffs.back().GetTariffData());


@@ -251,12 +247,12 @@ WriteServLog("%s Tariff \'%s\' added.",
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void TARIFFS_IMPL::GetTariffsData(std::list<TARIFF_DATA> * tdl) const
+void TARIFFS_IMPL::GetTariffsData(std::vector<TARIFF_DATA> * tdl) const

 {
 assert(tdl != NULL && "Tariffs data list is not null");
 STG_LOCKER lock(&mutex);
 
 {
 assert(tdl != NULL && "Tariffs data list is not null");
 STG_LOCKER lock(&mutex);
 

-Tariffs::const_iterator it = tariffs.begin();
+auto it = tariffs.begin();

 for (; it != tariffs.end(); ++it)
     {
     tdl->push_back(it->GetTariffData());
 for (; it != tariffs.end(); ++it)
     {
     tdl->push_back(it->GetTariffData());

diff --git a/stargazer/tariffs_impl.h b/stargazer/tariffs_impl.h
index 55cc49b336ebb6cb68a1388e142fd2d93da81b6c..c4f0f883f5face4c8a01ae24fdd82f499aba0d36 100644 (file)
--- a/stargazer/tariffs_impl.h
+++ b/stargazer/tariffs_impl.h
@@ -31,7 +31,7 @@
 #include "tariff_impl.h"
 
 #include <string>
 #include "tariff_impl.h"
 
 #include <string>

-#include <list>
+#include <vector>

 #include <set>
 
 #include <pthread.h>
 #include <set>
 
 #include <pthread.h>


@@ -45,7 +45,7 @@ class ADMIN;
 
 class TARIFFS_IMPL : public TARIFFS {
 public:
 
 class TARIFFS_IMPL : public TARIFFS {
 public:

-    typedef std::list<TARIFF_IMPL> Tariffs;
+    using Tariffs = std::vector<TARIFF_IMPL>;

 
     explicit TARIFFS_IMPL(STORE * store);
     virtual ~TARIFFS_IMPL();
 
     explicit TARIFFS_IMPL(STORE * store);
     virtual ~TARIFFS_IMPL();


@@ -63,7 +63,7 @@ public:
     void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
     void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
 
     void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
     void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
 

-    void GetTariffsData(std::list<TARIFF_DATA> * tdl) const;
+    void GetTariffsData(std::vector<TARIFF_DATA> * tdl) const;

 
     const std::string & GetStrError() const { return strError; }
 
 
     const std::string & GetStrError() const { return strError; }
 

diff --git a/tests/testtariffs.h b/tests/testtariffs.h
index f43bc22b400287416e3fe8f75fc9a1f1f05daebc..11c4cfff0b0885eedb283045c66d374265d75933 100644 (file)
--- a/tests/testtariffs.h
+++ b/tests/testtariffs.h
@@ -22,7 +22,7 @@ class TEST_TARIFFS : public TARIFFS {
         void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> *) {}
         void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> *) {}
 
         void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> *) {}
         void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> *) {}
 

-        void           GetTariffsData(std::list<TARIFF_DATA> * /*tdl*/) const {}
+        void           GetTariffsData(std::vector<TARIFF_DATA> * /*tdl*/) const {}

 
         size_t         Count() const { return 0; }
 
 
         size_t         Count() const { return 0; }