diff options
| author | Ben Cheng <bccheng@google.com> | 2014-04-15 22:37:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-15 22:37:29 +0000 |
| commit | 26c2bb84dd5cbd9ab43a5f0ebc2635bc3b64be3d (patch) | |
| tree | 395908c46cd0501bf91dcfc6170831c2e89ba459 | |
| parent | 073ea10156d62087a67a066527c92a1dbb92d650 (diff) | |
| parent | b760164dd67929789a4732ed3f5df56a4b66c3ae (diff) | |
| download | android_bionic-26c2bb84dd5cbd9ab43a5f0ebc2635bc3b64be3d.tar.gz android_bionic-26c2bb84dd5cbd9ab43a5f0ebc2635bc3b64be3d.tar.bz2 android_bionic-26c2bb84dd5cbd9ab43a5f0ebc2635bc3b64be3d.zip | |
Merge "Fix signed vs unsigned comparison."
| -rw-r--r-- | tests/sys_socket_test.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/sys_socket_test.cpp b/tests/sys_socket_test.cpp index 018889a1e..0bde0243d 100644 --- a/tests/sys_socket_test.cpp +++ b/tests/sys_socket_test.cpp @@ -179,7 +179,9 @@ static void TestRecvMMsg(struct sockaddr_un *addr, int fd) { memset(&ts, 0, sizeof(ts)); ts.tv_sec = 5; ts.tv_nsec = 0; - ASSERT_EQ(NUM_RECV_MSGS, recvmmsg(fd_acc, msgs, NUM_RECV_MSGS, 0, &ts)) << strerror(errno); + ASSERT_EQ(NUM_RECV_MSGS, + static_cast<size_t>(recvmmsg(fd_acc, msgs, NUM_RECV_MSGS, 0, &ts))) + << strerror(errno); for (size_t i = 0; i < NUM_RECV_MSGS; i++) { ASSERT_STREQ(g_RecvMsgs[i], bufs[i]); } @@ -247,7 +249,8 @@ static void TestSendMMsg(struct sockaddr_un *addr, int fd) { tv.tv_usec = 0; ASSERT_LT(0, select(fd_acc+1, &read_set, NULL, NULL, &tv)); char buffer[100]; - ASSERT_EQ(strlen(g_SendMsgs[i]) + 1, recv(fd_acc, buffer, sizeof(buffer), 0)); + ASSERT_EQ(strlen(g_SendMsgs[i]) + 1, + static_cast<size_t>(recv(fd_acc, buffer, sizeof(buffer), 0))); ASSERT_STREQ(g_SendMsgs[i], buffer); } |