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

[10643] Update the ACE part we use to 5.8.2

Browse source 
Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-10-25 20:36:51 +02:00
parent 8f71d95c0d
commit 23c920ca4b
739 changed files with 22031 additions and 40373 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dep/ACE_wrappers/ace/Message_Block.cpp
View file

@ -1,3 +1,4 @@
// $Id: Message_Block.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "ace/Message_Block.h"
#if !defined (__ACE_INLINE__)
@ -12,10 +13,6 @@
//#define ACE_ENABLE_TIMEPROBES
#include "ace/Timeprobe.h"
ACE_RCSID (ace,
Message_Block,
"$Id: Message_Block.cpp 80826 2008-03-04 14:51:23Z wotte $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE (ACE_Message_Block)
@ -154,7 +151,7 @@ ACE_Data_Block::dump (void) const
ACE_TEXT ("cur_size_ = %u\n")
ACE_TEXT ("max_size_ = %u\n")
ACE_TEXT ("flags_ = %u\n")
ACE_TEXT ("base_ = %u\n")
ACE_TEXT ("base_ = %@\n")
ACE_TEXT ("locking_strategy_ = %u\n")
ACE_TEXT ("reference_count_ = %u\n")
ACE_TEXT ("---------------------------\n"),
@ -179,11 +176,11 @@ ACE_Message_Block::dump (void) const
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("-----( Message Block )-----\n")
ACE_TEXT ("priority_ = %d\n")
ACE_TEXT ("next_ = %u\n")
ACE_TEXT ("prev_ = %u\n")
ACE_TEXT ("cont_ = %u\n")
ACE_TEXT ("rd_ptr_ = %u\n")
ACE_TEXT ("wr_ptr_ = %u\n")
ACE_TEXT ("next_ = %@\n")
ACE_TEXT ("prev_ = %@\n")
ACE_TEXT ("cont_ = %@\n")
ACE_TEXT ("rd_ptr_ = %@\n")
ACE_TEXT ("wr_ptr_ = %@\n")
ACE_TEXT ("---------------------------\n"),
this->priority_,
this->next_,
@ -815,8 +812,10 @@ ACE_Data_Block::release_no_delete (ACE_Lock *lock)
}
// This is the case when no lock was passed in
else
// Lock to be used is our lock
lock_to_be_used = this->locking_strategy_;
{
// Lock to be used is our lock
lock_to_be_used = this->locking_strategy_;
}
// If there's a locking strategy then we need to acquire the lock
// before decrementing the count.
@ -827,7 +826,9 @@ ACE_Data_Block::release_no_delete (ACE_Lock *lock)
result = this->release_i ();
}
else
result = this->release_i ();
{
result = this->release_i ();
}
return result;
}
@ -878,7 +879,7 @@ ACE_Message_Block::release (void)
// One guard for all
ACE_GUARD_RETURN (ACE_Lock, ace_mon, *lock, 0);
// Call non-guarded release with <lock>
// Call non-guarded release with @a lock
destroy_dblock = this->release_i (lock);
}
// This is the case when we have a valid data block but no lock
@ -980,6 +981,7 @@ ACE_Message_Block::~ACE_Message_Block (void)
this->prev_ = 0;
this->next_ = 0;
this->cont_ = 0;
}
ACE_Data_Block *