commit 96316386a428be274957dca20e12fcdb2a0670c4
author Ben Clayton <bclayton@google.com> Tue Oct 27 13:59:04 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 27 13:59:04 2015 +0000
tree f9f5a343155cafad14a43c3de8999e1f3c6282c5
parent ee75d717c0ed73120c3317851fcf71b25b282ab6
parent cdfb60b77eb4a6a95189a3fba360ef8e10e17324

Merge "Fix 32bit -> 64bit signed sign extension with thread IDs." into studio-master-dev

cc/gapic/android/thread.cpp

diff --git a/cc/gapic/android/thread.cpp b/cc/gapic/android/thread.cpp
index ed3d4a9..3b24003 100644
--- a/cc/gapic/android/thread.cpp
+++ b/cc/gapic/android/thread.cpp
@@ -18,11 +18,14 @@
 
 #include <pthread.h>
 
+#include <type_traits>
+
 namespace gapic {
 
 Thread Thread::current() {
     auto thread = pthread_self();
-    return Thread(static_cast<uint64_t>(thread));
+    auto asUnsigned = static_cast<std::make_unsigned<decltype(thread)>::type>(thread);
+    return Thread(static_cast<uint64_t>(asUnsigned));
 }
 
 } // namespace gapic