summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Thread.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2018-10-26 17:17:11 -0400
committerBernard Normier <bernard@zeroc.com>2018-10-26 17:17:11 -0400
commit42c905a3ca29a1e911e7def9c2d9d9b8e95383cd (patch)
tree1b704d084e39c0acd15859f2dd258eff7aaa7fc6 /cpp/src/Ice/Thread.cpp
parentDo not use time.clock() with Python >= 3.3 as it is deprecated (diff)
downloadice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.bz2
ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.xz
ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.zip
Extra C++ warning flags with clang and g++.
Fixes 223.
Diffstat (limited to 'cpp/src/Ice/Thread.cpp')
-rw-r--r--cpp/src/Ice/Thread.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp
index dc10ed825e2..4186303e0ea 100644
--- a/cpp/src/Ice/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
@@ -567,8 +567,8 @@ IceUtil::ThreadControl::join()
throw BadThreadControlException(__FILE__, __LINE__);
}
- void* ignore = 0;
- int rc = pthread_join(_thread, &ignore);
+ void* status = 0;
+ int rc = pthread_join(_thread, &status);
if(rc != 0)
{
throw ThreadSyscallException(__FILE__, __LINE__, rc);