X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c3d4d096451b5c683492e81574b302e5486950e1..d1d65fe3185a6c2178bbca46e9f409bd8d747c7f:/projects/stargazer/services_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/services_impl.cpp b/projects/stargazer/services_impl.cpp index aebb98fb..ac856000 100644 --- a/projects/stargazer/services_impl.cpp +++ b/projects/stargazer/services_impl.cpp @@ -54,7 +54,7 @@ if (!priv->serviceChg) return -1; } -srv_iter si(find(data.begin(), data.end(), service)); +iterator si(find(data.begin(), data.end(), service)); if (si != data.end()) { @@ -92,7 +92,7 @@ if (!priv->serviceChg) 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()) { @@ -101,7 +101,7 @@ if (si == data.end()) return -1; } -std::map::iterator csi; +std::map::iterator csi; csi = searchDescriptors.begin(); while (csi != searchDescriptors.end()) { @@ -136,7 +136,7 @@ if (!priv->serviceChg) return -1; } -srv_iter si(find(data.begin(), data.end(), service)); +iterator si(find(data.begin(), data.end(), service)); if (si == data.end()) { @@ -184,7 +184,7 @@ for (size_t i = 0; i < servicesList.size(); i++) return false; } //----------------------------------------------------------------------------- -bool SERVICES_IMPL::Find(const std::string & name, SERVICE_CONF * service) +bool SERVICES_IMPL::Find(const std::string & name, SERVICE_CONF * service) const { assert(service != NULL && "Pointer to service is not null"); @@ -192,7 +192,7 @@ STG_LOCKER lock(&mutex); if (data.empty()) return false; -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()) { @@ -212,7 +212,7 @@ if (data.empty()) 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;