mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +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

34
dep/ACE_wrappers/ace/Map_Manager.cpp
View file

@ -1,4 +1,4 @@
// $Id: Map_Manager.cpp 80826 2008-03-04 14:51:23Z wotte $
// $Id: Map_Manager.cpp 91809 2010-09-17 07:20:41Z johnnyw $
#ifndef ACE_MAP_MANAGER_CPP
#define ACE_MAP_MANAGER_CPP
@ -640,38 +640,6 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
#endif /* ACE_HAS_DUMP */
}
template <class EXT_ID, class INT_ID, class ACE_LOCK>
ACE_Map_Entry<EXT_ID, INT_ID>&
ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
{
// @@ This function should be inlined. We moved it here to avoid a
// compiler bug in SunCC 4.2. Once we know the correct patch to fix
// the compiler problem, it should be moved back to .i file again.
ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
int result = this->next (retv);
ACE_ASSERT (result != 0);
ACE_UNUSED_ARG (result);
return *retv;
}
template <class EXT_ID, class INT_ID, class ACE_LOCK>
ACE_Map_Entry<EXT_ID, INT_ID>&
ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
{
// @@ This function should be inlined. We moved it here to avoid a
// compiler bug in SunCC 4.2. Once we know the correct patch to fix
// the compiler problem, it should be moved back to .i file again.
ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
int result = this->next (retv);
ACE_ASSERT (result != 0);
ACE_UNUSED_ARG (result);
return *retv;
}
template <class EXT_ID, class INT_ID, class ACE_LOCK> void
ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
{