Better names for service iterators.

diff --git a/projects/stargazer/services_impl.cpp b/projects/stargazer/services_impl.cpp
index ea231615f205794f6767071febf3be5763c6ecf2..ac8560009de58c79537f882f633ca840f445e641 100644 (file)
--- a/projects/stargazer/services_impl.cpp
+++ b/projects/stargazer/services_impl.cpp
@@ -54,7 +54,7 @@ if (!priv->serviceChg)
     return -1;
     }
 
     return -1;
     }
 

-srv_iter si(find(data.begin(), data.end(), service));
+iterator si(find(data.begin(), data.end(), service));

 
 if (si != data.end())
     {
 
 if (si != data.end())
     {


@@ -92,7 +92,7 @@ if (!priv->serviceChg)
     return -1;
     }
 
     return -1;
     }
 

-srv_iter si(find(data.begin(), data.end(), SERVICE_CONF(name)));
+iterator si(find(data.begin(), data.end(), SERVICE_CONF(name)));

 
 if (si == data.end())
     {
 
 if (si == data.end())
     {


@@ -101,7 +101,7 @@ if (si == data.end())
     return -1;
     }
 
     return -1;
     }
 

-std::map<int, const_srv_iter>::iterator csi;
+std::map<int, const_iterator>::iterator csi;

 csi = searchDescriptors.begin();
 while (csi != searchDescriptors.end())
     {
 csi = searchDescriptors.begin();
 while (csi != searchDescriptors.end())
     {


@@ -136,7 +136,7 @@ if (!priv->serviceChg)
     return -1;
     }
 
     return -1;
     }
 

-srv_iter si(find(data.begin(), data.end(), service));
+iterator si(find(data.begin(), data.end(), service));

 
 if (si == data.end())
     {
 
 if (si == data.end())
     {


@@ -192,7 +192,7 @@ STG_LOCKER lock(&mutex);
 if (data.empty())
     return false;
 
 if (data.empty())
     return false;
 

-const_srv_iter si(find(data.begin(), data.end(), SERVICE_CONF(name)));
+const_iterator si(find(data.begin(), data.end(), SERVICE_CONF(name)));

 
 if (si != data.end())
     {
 
 if (si != data.end())
     {


@@ -212,7 +212,7 @@ if (data.empty())
     return true;
     }
 
     return true;
     }
 

-const_srv_iter si(find(data.begin(), data.end(), SERVICE_CONF(name)));
+const_iterator si(find(data.begin(), data.end(), SERVICE_CONF(name)));

 
 if (si != data.end())
     return true;
 
 if (si != data.end())
     return true;

diff --git a/projects/stargazer/services_impl.h b/projects/stargazer/services_impl.h
index 254df8a100d5a702a414017cbdd9d7e7672da7d1..0415183c06264b89ca877d9fda8e5e317c416eb0 100644 (file)
--- a/projects/stargazer/services_impl.h
+++ b/projects/stargazer/services_impl.h
@@ -58,15 +58,15 @@ private:
     SERVICES_IMPL(const SERVICES_IMPL & rvalue);
     SERVICES_IMPL & operator=(const SERVICES_IMPL & rvalue);
 
     SERVICES_IMPL(const SERVICES_IMPL & rvalue);
     SERVICES_IMPL & operator=(const SERVICES_IMPL & rvalue);
 

-    typedef std::list<SERVICE_CONF>::iterator       srv_iter;
-    typedef std::list<SERVICE_CONF>::const_iterator const_srv_iter;
+    typedef std::list<SERVICE_CONF>::iterator       iterator;
+    typedef std::list<SERVICE_CONF>::const_iterator const_iterator;

 
     bool Read();
 
     std::list<SERVICE_CONF> data;
     STORE *                 store;
     STG_LOGGER &            WriteServLog;
 
     bool Read();
 
     std::list<SERVICE_CONF> data;
     STORE *                 store;
     STG_LOGGER &            WriteServLog;

-    mutable std::map<int, const_srv_iter> searchDescriptors;
+    mutable std::map<int, const_iterator> searchDescriptors;

     mutable unsigned int    handle;
     mutable pthread_mutex_t mutex;
     std::string             strError;
     mutable unsigned int    handle;
     mutable pthread_mutex_t mutex;
     std::string             strError;