From: Jake Farrell <jfarrell@apache.org>
Date: Tue, 17 Jan 2012 14:28:05 +0000 (+0000)
Subject: Thrift:1488 - src/concurrency/Thread.h:91:58: error: invalid conversion from 'pthread... 
X-Git-Tag: 0.9.1~468
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d77d180355a28ea5523480c2bd3bf34633711fd6;p=common%2Fthrift.git

Thrift:1488 - src/concurrency/Thread.h:91:58: error: invalid conversion from 'pthread_t {aka _opaque_pthread_t*}'
Client: cpp
Patch: Jake Farrell

Added cast to Thread.h get_current()



git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1232424 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/cpp/src/concurrency/Thread.h b/lib/cpp/src/concurrency/Thread.h
index 654778cb..dc3c7486 100755
--- a/lib/cpp/src/concurrency/Thread.h
+++ b/lib/cpp/src/concurrency/Thread.h
@@ -88,7 +88,7 @@ class Thread {
 #else
   typedef uint64_t id_t;
   static inline bool is_current(pthread_t t) { return pthread_equal(pthread_self(), t); }
-  static inline id_t get_current() { return pthread_self(); }
+  static inline id_t get_current() { return (Thread::id_t)pthread_self(); }
 #endif
 
   virtual ~Thread() {};