Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Charles Phillips 2016-01-25 22:54:58 -08:00
parent 63ef328ad6
commit 0b2d10a603
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Rest/InitializeRest.cpp
View File

@ -58,10 +58,17 @@ unsigned long opensslThreadId() { return (unsigned long)TRI_CurrentThreadId(); }
// The compiler chooses the right one from the following two, // The compiler chooses the right one from the following two,
// according to the type of the return value of pthread_self(): // according to the type of the return value of pthread_self():
#ifndef __sun
template <typename T> template <typename T>
void setter(CRYPTO_THREADID* id, T p) { void setter(CRYPTO_THREADID* id, T p) {
CRYPTO_THREADID_set_pointer(id, 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__ #ifndef __APPLE__
template <> template <>