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

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dep/acelite/ace/Service_Config.cpp
View file

@ -1,3 +1,5 @@
// $Id: Service_Config.cpp 97326 2013-09-11 07:52:09Z johnnyw $
#include "ace/Service_Config.h"
#if !defined (__ACE_INLINE__)
@ -22,9 +24,6 @@
#include "ace/Log_Category.h"
#include "ace/ACE.h"
#ifdef ACE_HAS_TSS_EMULATION
#include "ace/Object_Manager.h"
#endif
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -109,7 +108,7 @@ ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg)
if (ACE::debug ())
ACELIB_DEBUG ((LM_DEBUG,
ACE_TEXT ("ACE (%P|%t) - SCG:<ctor=%@>")
ACE_TEXT (" - config=%@ repo=%@ superseded by repo=%@\n"),
ACE_TEXT (" - config=%@ repo=%@ superceded by repo=%@\n"),
this,
this->saved_.get (),
this->saved_->repo_,
@ -539,12 +538,11 @@ ACE_Service_Config::reconfigure (void)
{
#if !defined (ACE_NLOGGING)
time_t t = ACE_OS::time (0);
#endif /* ! ACE_NLOGGING */
if (ACE::debug ())
ACELIB_DEBUG ((LM_DEBUG,
ACE_TEXT ("beginning reconfiguration at %s"),
ACE_OS::ctime (&t)));
#endif /* ! ACE_NLOGGING */
}
if (ACE_Service_Config::process_directives () == -1)
ACELIB_ERROR ((LM_ERROR,