fix,solaris: invalid conversion from 'unsigned int' to 'void*' ptr

doublerebel · doublerebel · commit 0b2d10a60371 · 2016-01-25T23:29:04.000-08:00
diff --git a/lib/Rest/InitializeRest.cpp b/lib/Rest/InitializeRest.cpp
@@ -58,10 +58,17 @@ unsigned long opensslThreadId() { return (unsigned long)TRI_CurrentThreadId(); }
 // The compiler chooses the right one from the following two,
 // according to the type of the return value of pthread_self():
 
+#ifndef __sun
 template <typename T>
 void setter(CRYPTO_THREADID* id, T p) {
   CRYPTO_THREADID_set_pointer(id, p);
 }
+#else
+template <typename T>
+void setter(CRYPTO_THREADID* id, T p) {
+  CRYPTO_THREADID_set_pointer(id, (void *) (intptr_t) p);
+}
+#endif
 
 #ifndef __APPLE__
 template <>
