Added assignment operator for SGCONF::OPTION.

[stg.git] / projects / stargazer / plugins / other / rscript / ur_functor.h

diff --git a/projects/stargazer/plugins/other/rscript/ur_functor.h b/projects/stargazer/plugins/other/rscript/ur_functor.h
index c5752e870a7811c60629391b86499d86443b8677..95382400f6403e945b3e05768ac40d718b3aece1 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/ur_functor.h
+++ b/projects/stargazer/plugins/other/rscript/ur_functor.h
@@ -37,11 +37,11 @@ class UpdateRouter : public std::unary_function<std::pair<const uint32_t, RS::US
 {
 public:
     UpdateRouter(REMOTE_SCRIPT & t)
 {
 public:
     UpdateRouter(REMOTE_SCRIPT & t)

-        : obj(t) {};
+        : obj(t) {}

 
     void operator() (std::pair<const uint32_t, USER> & val)
         {
 
     void operator() (std::pair<const uint32_t, USER> & val)
         {

-        std::vector<uint32_t> newRouters = obj.IP2Routers(val.first);
+        std::vector<uint32_t> newRouters = obj.IP2Routers(val.second.ip);

         std::vector<uint32_t>::const_iterator oldIt(val.second.routers.begin());
         std::vector<uint32_t>::const_iterator newIt(newRouters.begin());
         val.second.shortPacketsCount = 0;
         std::vector<uint32_t>::const_iterator oldIt(val.second.routers.begin());
         std::vector<uint32_t>::const_iterator newIt(newRouters.begin());
         val.second.shortPacketsCount = 0;


@@ -52,23 +52,23 @@ public:
                 {
                 if (newIt != newRouters.end())
                     {
                 {
                 if (newIt != newRouters.end())
                     {

-                    obj.SendDirect(val.first, val.second, *newIt); // Connect on new router
+                    obj.SendDirect(val.second, *newIt); // Connect on new router

                     ++newIt;
                     }
                 }
             else if (newIt == newRouters.end())
                 {
                     ++newIt;
                     }
                 }
             else if (newIt == newRouters.end())
                 {

-                obj.SendDirect(val.first, val.second, *oldIt, true); // Disconnect on old router
+                obj.SendDirect(val.second, *oldIt, true); // Disconnect on old router

                 ++oldIt;
                 } 
             else if (*oldIt < *newIt)
                 {
                 ++oldIt;
                 } 
             else if (*oldIt < *newIt)
                 {

-                obj.SendDirect(val.first, val.second, *oldIt, true); // Disconnect on old router
+                obj.SendDirect(val.second, *oldIt, true); // Disconnect on old router

                 ++oldIt;
                 }
             else if (*oldIt > *newIt)
                 {
                 ++oldIt;
                 }
             else if (*oldIt > *newIt)
                 {

-                obj.SendDirect(val.first, val.second, *newIt); // Connect on new router
+                obj.SendDirect(val.second, *newIt); // Connect on new router

                 ++newIt;
                 }
             else
                 ++newIt;
                 }
             else