mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dep/acelite/ace/Local_Tokens.cpp
View file

@ -1,3 +1,5 @@
// $Id: Local_Tokens.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Local_Tokens.h"
#if defined (ACE_HAS_TOKENS_LIBRARY)
@ -119,11 +121,11 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy,
// The cast is an attempt to get this to compile (and run,
// hopefully) regardless of the type of ACE_thread_t.
ACE_OS::snprintf (name, sizeof name / sizeof name[0],
ACE_TEXT ("/%s/%u/%lu"),
host_name,
static_cast<u_int> (ACE_OS::getpid ()),
*reinterpret_cast<u_long *> (&thread_id));
ACE_OS::sprintf (name,
ACE_TEXT ("/%s/%u/%lu"),
host_name,
static_cast<u_int> (ACE_OS::getpid ()),
*reinterpret_cast<u_long *> (&thread_id));
this->client_id (name);
}
@ -1188,8 +1190,8 @@ ACE_Token_Proxy::open (const ACE_TCHAR *token_name,
// We must have a name.
if (token_name == 0)
{
ACE_OS::snprintf (name, BUFSIZ, ACE_TEXT ("token %lx"),
reinterpret_cast<long> (this));
ACE_OS::sprintf (name, ACE_TEXT ("token %lx"),
reinterpret_cast<long> (this));
token_name = name;
}