git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add divert_cap params description.
[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 95382400f6403e945b3e05768ac40d718b3aece1..9ecf2bc5887f30fd3f899eedffb717a693613155 100644
(file)
--- a/
projects/stargazer/plugins/other/rscript/ur_functor.h
+++ b/
projects/stargazer/plugins/other/rscript/ur_functor.h
@@
-21,14
+21,14
@@
#ifndef __UR_FUNCTOR_H__
#define __UR_FUNCTOR_H__
#ifndef __UR_FUNCTOR_H__
#define __UR_FUNCTOR_H__
-#include <functional>
-#include <algorithm>
-#include <utility>
+#include "rscript.h"
#include "stg/os_int.h"
#include "stg/common.h"
#include "stg/os_int.h"
#include "stg/common.h"
-#include "rscript.h"
+#include <functional>
+#include <algorithm>
+#include <utility>
namespace RS
{
namespace RS
{
@@
-36,7
+36,7
@@
namespace RS
class UpdateRouter : public std::unary_function<std::pair<const uint32_t, RS::USER>, void>
{
public:
class UpdateRouter : public std::unary_function<std::pair<const uint32_t, RS::USER>, void>
{
public:
- UpdateRouter(REMOTE_SCRIPT & t)
+
explicit
UpdateRouter(REMOTE_SCRIPT & t)
: obj(t) {}
void operator() (std::pair<const uint32_t, USER> & val)
: obj(t) {}
void operator() (std::pair<const uint32_t, USER> & val)
@@
-60,7
+60,7
@@
public:
{
obj.SendDirect(val.second, *oldIt, true); // Disconnect on old router
++oldIt;
{
obj.SendDirect(val.second, *oldIt, true); // Disconnect on old router
++oldIt;
- }
+ }
else if (*oldIt < *newIt)
{
obj.SendDirect(val.second, *oldIt, true); // Disconnect on old router
else if (*oldIt < *newIt)
{
obj.SendDirect(val.second, *oldIt, true); // Disconnect on old router
@@
-73,8
+73,7
@@
public:
}
else
{
}
else
{
- if (oldIt != val.second.routers.end())
- ++oldIt;
+ ++oldIt;
if (newIt != newRouters.end())
++newIt;
}
if (newIt != newRouters.end())
++newIt;
}