summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-04-30 21:51:05 -0700
committerGrant Limberg <glimberg@gmail.com>2015-04-30 21:51:05 -0700
commitb242886c339f013b6ad10caa3bc5d5be10628da3 (patch)
tree6e14963f2bd30313ff990c1f3e65415d2e4c6b07 /service
parent0a15eae00f7360930dad1fcfb25f02c15c930710 (diff)
parent9279bac385d842d7f031306bc9a68bbb737bd3ce (diff)
downloadinfinitytier-b242886c339f013b6ad10caa3bc5d5be10628da3.tar.gz
infinitytier-b242886c339f013b6ad10caa3bc5d5be10628da3.zip
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service')
-rw-r--r--service/OneService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 3886c157..421b47dd 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -508,7 +508,7 @@ public:
long sent = _phy.tcpSend(sock,tc->writeBuf.data(),tc->writeBuf.length(),true);
if (sent > 0) {
tc->lastActivity = OSUtils::now();
- if (sent == tc->writeBuf.length()) {
+ if ((unsigned long)sent == (unsigned long)tc->writeBuf.length()) {
tc->writeBuf = "";
_phy.tcpSetNotifyWritable(sock,false);
if (!tc->shouldKeepAlive)