git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed rsconf.cpp.
[stg.git]
/
projects
/
rscriptd
/
listener.cpp
diff --git
a/projects/rscriptd/listener.cpp
b/projects/rscriptd/listener.cpp
index 9fe4c0f0c37cce0730be4f730c7630028a63ddd4..cc2a05603c88666c9d421fbf752a0e95160563f6 100644
(file)
--- a/
projects/rscriptd/listener.cpp
+++ b/
projects/rscriptd/listener.cpp
@@
-311,7
+311,7
@@
else if (packetHead.packetType == RS_DISCONNECT_PACKET)
}
}
}
}
-STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+STG_LOCKER lock(&mutex);
pending.push_back(data);
return false;
pending.push_back(data);
return false;
@@
-411,7
+411,7
@@
while (it != pending.end() && count < 256)
++it;
++count;
}
++it;
++count;
}
-STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+STG_LOCKER lock(&mutex);
pending.erase(pending.begin(), it);
}
//-----------------------------------------------------------------------------
pending.erase(pending.begin(), it);
}
//-----------------------------------------------------------------------------