mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2026-01-02 01:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Rel21] Stage 1 of updates for Rel21 Build System

Browse source
This commit is contained in:
Antz 2015-07-28 10:59:34 +01:00 • committed by Antz
parent 13292befd6
commit fdefc0869a
1951 changed files with 40474 additions and 252610 deletions
Download patch file Download diff file Expand all files Collapse all files

27
dep/acelite/ace/UUID.cpp
View file

@ -1,4 +1,4 @@
//$Id: UUID.cpp 96017 2012-08-08 22:18:09Z mitza $
//$Id: UUID.cpp 97383 2013-10-23 08:44:20Z mhengstmengel $
#include "ace/UUID.h"
#include "ace/Guard_T.h"
@ -7,7 +7,7 @@
#include "ace/UUID.inl"
#endif /* __ACE_INLINE__ */
#include "ace/Log_Msg.h"
#include "ace/Log_Category.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_sys_time.h"
@ -131,7 +131,7 @@ namespace ACE_Utils
{
if (uuid_string.length () < NIL_UUID.to_string ()->length ())
{
ACE_ERROR ((LM_ERROR,
ACELIB_ERROR ((LM_ERROR,
"%N ACE_UUID::from_string_i - "
"IllegalArgument (incorrect string length)\n"));
return;
@ -182,7 +182,7 @@ namespace ACE_Utils
if (nScanned != 11)
{
ACE_DEBUG ((LM_DEBUG,
ACELIB_DEBUG ((LM_DEBUG,
"UUID::from_string_i - "
"IllegalArgument (invalid string representation)\n"));
return;
@ -228,7 +228,7 @@ namespace ACE_Utils
if (nScanned != 12)
{
ACE_DEBUG ((LM_DEBUG,
ACELIB_DEBUG ((LM_DEBUG,
"ACE_UUID::from_string_i - "
"IllegalArgument (invalid string representation)\n"));
return;
@ -248,7 +248,7 @@ namespace ACE_Utils
if ((this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) != 0x80 &&
(this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) != 0xc0)
{
ACE_DEBUG ((LM_DEBUG,
ACELIB_DEBUG ((LM_DEBUG,
"ACE_UUID::from_string_i - "
"IllegalArgument (unsupported variant)\n"));
return;
@ -261,7 +261,7 @@ namespace ACE_Utils
(V1 & 0xF000) != 0x3000 &&
(V1 & 0xF000) != 0x4000)
{
ACE_DEBUG ((LM_DEBUG,
ACELIB_DEBUG ((LM_DEBUG,
"ACE_UUID::from_string_i - "
"IllegalArgument (unsupported version)\n"));
return;
@ -271,7 +271,7 @@ namespace ACE_Utils
{
if (uuid_string.length () == NIL_UUID.to_string ()->length ())
{
ACE_DEBUG ((LM_DEBUG,
ACELIB_DEBUG ((LM_DEBUG,
"ACE_UUID::from_string_i - "
"IllegalArgument (Missing Thread and Process Id)\n"));
return;
@ -279,7 +279,7 @@ namespace ACE_Utils
ACE_CString thr_pid_str (thr_pid_buf);
ssize_t pos = static_cast<ssize_t> (thr_pid_str.find ('-'));
if (pos == -1)
ACE_DEBUG ((LM_DEBUG,
ACELIB_DEBUG ((LM_DEBUG,
"ACE_UUID::from_string_i - "
"IllegalArgument (Thread and Process Id format incorrect)\n"));
@ -348,8 +348,8 @@ namespace ACE_Utils
UUID_Generator::
generate_UUID (UUID& uuid, ACE_UINT16 version, u_char variant)
{
UUID_Time timestamp;
ACE_UINT16 clock_sequence;
UUID_Time timestamp = 0;
ACE_UINT16 clock_sequence = 0;
this->get_timestamp_and_clocksequence (timestamp,
clock_sequence);
@ -487,9 +487,6 @@ namespace ACE_Utils
}
}
#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
template ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX> *
ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX>::singleton_;
#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX);
ACE_END_VERSIONED_NAMESPACE_DECL