[10874] Update ACE to v5.8.3

(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

View file

@ -1,4 +1,4 @@
// $Id: Dynamic_Service_Base.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
// $Id: Dynamic_Service_Base.cpp 91813 2010-09-17 07:52:52Z johnnyw $
#include "ace/Dynamic_Service_Base.h"
#include "ace/ACE.h"
@ -78,7 +78,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
if (ACE::debug ())
{
ACE_Guard <ACE_Log_Msg> log_guard (*ACE_Log_Msg::instance ());
ACE_GUARD_RETURN (ACE_Log_Msg, log_guard, *ACE_Log_Msg::instance (), 0);
if (repo->repo_ != repo_found->repo_)
{
@ -86,7 +86,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s")
ACE_TEXT (" type=%@ => %@")
ACE_TEXT (" [in repo=%@]\n"),
repo->repo_, name, type, obj,
repo->repo_, name, type, obj,
repo_found->repo_));
}
else