Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #872 threadid is now in size_t. patch by rti

Browse source
This commit is contained in:
vl 2010-05-13 19:00:29 +02:00
parent b1775e4b40
commit fa7b90e27d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/common.h
View file

@ -298,7 +298,7 @@ void nlSleep( uint32 ms );
#endif #endif
/// Returns Thread Id (note: on Linux, Process Id is the same as the Thread Id) /// Returns Thread Id (note: on Linux, Process Id is the same as the Thread Id)
uint getThreadId(); size_t getThreadId();
/// Returns a readable string from a vector of bytes. unprintable char are replaced by '?' /// Returns a readable string from a vector of bytes. unprintable char are replaced by '?'
std::string stringFromVector( const std::vector<uint8>& v, bool limited = true ); std::string stringFromVector( const std::vector<uint8>& v, bool limited = true );

4
code/nel/src/misc/common.cpp
View file

@ -107,12 +107,12 @@ void nlSleep( uint32 ms )
/* /*
* Returns Thread Id (note: on Linux, Process Id is the same as the Thread Id) * Returns Thread Id (note: on Linux, Process Id is the same as the Thread Id)
*/ */
uint getThreadId() size_t getThreadId()
{ {
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
return GetCurrentThreadId(); return GetCurrentThreadId();
#elif defined NL_OS_UNIX #elif defined NL_OS_UNIX
return uint(pthread_self()); return size_t(pthread_self());
// doesnt work on linux kernel 2.6 return getpid(); // doesnt work on linux kernel 2.6 return getpid();
#endif #endif

2
code/nel/src/net/unified_network.cpp
View file

@ -34,7 +34,7 @@ using namespace NLMISC;
namespace NLNET { namespace NLNET {
static uint ThreadCreator = 0; static size_t ThreadCreator = 0;
static const uint64 AppIdDeadConnection = 0xDEAD; static const uint64 AppIdDeadConnection = 0xDEAD;