mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[10643] Update the ACE part we use to 5.8.2
Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
parent
8f71d95c0d
commit
23c920ca4b
739 changed files with 22031 additions and 40373 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// $Id: System_Time.cpp 80826 2008-03-04 14:51:23Z wotte $
|
||||
// $Id: System_Time.cpp 91286 2010-08-05 09:04:31Z johnnyw $
|
||||
|
||||
#include "ace/System_Time.h"
|
||||
#include "ace/MMAP_Memory_Pool.h"
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#include "ace/OS_NS_string.h"
|
||||
#include "ace/OS_NS_time.h"
|
||||
|
||||
ACE_RCSID(ace, System_Time, "$Id: System_Time.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ ACE_System_Time::get_master_system_time (time_t &time_out)
|
|||
if (this->delta_time_ == 0)
|
||||
{
|
||||
// Try to find it
|
||||
void * temp;
|
||||
void * temp = 0;
|
||||
if (this->shmem_->find (ACE_DEFAULT_TIME_SERVER_STR, temp) == -1)
|
||||
{
|
||||
// No time entry in shared memory (meaning no Clerk exists)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue