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

[10874] Update ACE to v5.8.3

Browse source 
(based on zergtmn's repo commit 3a8c259)
(based on zergtmn's repo commit 946c1a8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-12-14 17:14:34 +03:00 • committed by VladimirMangos
parent c38c876b1d
commit b8d773091a
343 changed files with 3060 additions and 7431 deletions
Download patch file Download diff file Expand all files Collapse all files

46
dep/ACE_wrappers/ace/Map_T.cpp
View file

@ -1,4 +1,4 @@
// $Id: Map_T.cpp 80826 2008-03-04 14:51:23Z wotte $
// $Id: Map_T.cpp 92097 2010-09-30 05:41:49Z msmit $
#ifndef ACE_MAP_T_CPP
#define ACE_MAP_T_CPP
@ -340,8 +340,8 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::dereference () const
{
// The following syntax is necessary to work around certain broken compilers.
// In particular, please do not prefix implementation_ with this->
return T ((*implementation_).int_id_.first (),
(*implementation_).int_id_.second ());
return T ((*implementation_).int_id_.first,
(*implementation_).int_id_.second);
}
template <class T, class VALUE> void
@ -386,8 +386,8 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::dereference () const
{
// The following syntax is necessary to work around certain broken compilers.
// In particular, please do not prefix implementation_ with this->
return T ((*implementation_).int_id_.first (),
(*implementation_).int_id_.second ());
return T ((*implementation_).int_id_.first,
(*implementation_).int_id_.second);
}
template <class T, class VALUE> void
@ -443,13 +443,13 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_modify_key (const
// of <expanded_value>.
result = this->key_adapter_.encode (key,
active_key,
internal_value->first ());
internal_value->first);
if (result == 0)
{
// Copy user value into <expanded_value>.
internal_value->second (value);
internal_value->second = value;
// Copy new, modified key back to the user key.
key = internal_value->first ();
key = internal_value->first;
}
else
{
@ -479,15 +479,15 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_create_key (const
if (result == 0)
{
// Encode the active key into key part of <expanded_value>.
result = this->key_adapter_.encode (internal_value->first (),
result = this->key_adapter_.encode (internal_value->first,
active_key,
internal_value->first ());
internal_value->first);
if (result == 0)
{
// Copy user value into <expanded_value>.
internal_value->second (value);
internal_value->second = value;
// Copy new, modified key to the user key.
key = internal_value->first ();
key = internal_value->first;
}
else
{
@ -510,13 +510,13 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_create_key (const
if (result == 0)
{
// Encode the active key into key part of <expanded_value>.
result = this->key_adapter_.encode (internal_value->first (),
result = this->key_adapter_.encode (internal_value->first,
active_key,
internal_value->first ());
internal_value->first);
if (result == 0)
{
// Copy user value into <expanded_value>.
internal_value->second (value);
internal_value->second = value;
}
else
{
@ -567,7 +567,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::find (const KEY &key,
if (result == 0)
{
// Copy value.
value = internal_value->second ();
value = internal_value->second;
}
return result;
@ -592,7 +592,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
if (result == 0)
{
// Reset value.
internal_value->second (value);
internal_value->second = value;
}
return result;
@ -610,10 +610,10 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
if (result == 0)
{
// Copy old value.
old_value = internal_value->second ();
old_value = internal_value->second;
// Reset to new value.
internal_value->second (value);
internal_value->second = value;
}
return result;
@ -632,11 +632,11 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
if (result == 0)
{
// Copy old key and value.
old_key = internal_value->first ();
old_value = internal_value->second ();
old_key = internal_value->first;
old_value = internal_value->second;
// Reset to new value.
internal_value->second (value);
internal_value->second = value;
}
return result;
@ -686,7 +686,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key,
if (result == 0)
{
// Copy value.
value = internal_value->second ();
value = internal_value->second;
}
return result;