josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)

Browse Source 
*Fix a possible crash in Spell::DoAllEffectOnTarget

--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-17 15:35:07 -07:00
parent f21f47005d
commit 26b5e033ff
2257 changed files with 750 additions and 103852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/ACE_wrappers/ace/Service_Config.inl
-27
View File
@@ -1,11 +1,8 @@
// -*- C++ -*-
//
// $Id: Service_Config.inl 81673 2008-05-09 19:09:43Z iliyan $
#include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// This is the primary entry point into the ACE_Service_Config (the
// constructor just handles simple initializations).
ACE_INLINE int
@@ -22,7 +19,6 @@ ACE_Service_Config::open (const ACE_TCHAR program_name[],
ignore_default_svc_conf,
ignore_debug_flag) == -1)
return -1;
return current()->open (program_name,
logger_key,
ignore_static_svcs,
@@ -30,7 +26,6 @@ ACE_Service_Config::open (const ACE_TCHAR program_name[],
ignore_debug_flag);
}
ACE_INLINE int
ACE_Service_Config::open (int argc,
ACE_TCHAR *argv[],
@@ -46,7 +41,6 @@ ACE_Service_Config::open (int argc,
ignore_default_svc_conf,
ignore_debug_flag) == -1)
return -1;
return current()->open (argc,
argv,
logger_key,
@@ -54,7 +48,6 @@ ACE_Service_Config::open (int argc,
ignore_default_svc_conf,
ignore_debug_flag);
}
// Handle the command-line options intended for the
// ACE_Service_Config.
ACE_INLINE int
@@ -62,7 +55,6 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[])
{
return ACE_Service_Config::current ()->parse_args (argc, argv);
}
/// Return the global configuration instance. Allways returns the same
/// instance
ACE_INLINE ACE_Service_Gestalt *
@@ -70,7 +62,6 @@ ACE_Service_Config::global (void)
{
return ACE_Service_Config::singleton()->instance_.get ();
}
/// Return the configuration instance, considered "global" in the
/// current thread. This may be the same as instance(), but on some
/// occasions, it may be a different one. For example,
@@ -81,7 +72,6 @@ ACE_Service_Config::instance (void)
{
return ACE_Service_Config::current ();
}
// This method has changed to return the gestalt instead of the
// container, underlying the service repository and defined
// ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor*). This way
@@ -89,33 +79,28 @@ ACE_Service_Config::instance (void)
// ACE_Service_Config::static_svcs(), however now it is not necessary
// to expose the repository storage *and* it is much easier to debug
// service registration problems.
ACE_INLINE ACE_Service_Gestalt*
ACE_Service_Config::static_svcs (void)
{
return ACE_Service_Config::current ();
}
/// Compare two service descriptors for equality.
ACE_INLINE bool
ACE_Static_Svc_Descriptor::operator== (ACE_Static_Svc_Descriptor &d) const
{
return ACE_OS::strcmp (name_, d.name_) == 0;
}
/// Compare two service descriptors for inequality.
ACE_INLINE bool
ACE_Static_Svc_Descriptor::operator!= (ACE_Static_Svc_Descriptor &d) const
{
return !(*this == d);
}
ACE_INLINE void
ACE_Service_Config::signal_handler (ACE_Sig_Adapter *signal_handler)
{
signal_handler_ = signal_handler;
}
/// Initialize and activate a statically linked service.
ACE_INLINE int
ACE_Service_Config::initialize (const ACE_TCHAR *svc_name,
@@ -125,7 +110,6 @@ ACE_Service_Config::initialize (const ACE_TCHAR *svc_name,
return ACE_Service_Config::current ()->initialize (svc_name,
parameters);
}
/// Dynamically link the shared object file and retrieve a pointer to
/// the designated shared object in this file.
ACE_INLINE int
@@ -135,21 +119,18 @@ ACE_Service_Config::initialize (const ACE_Service_Type *sr,
ACE_TRACE ("ACE_Service_Config::initialize");
return ACE_Service_Config::current ()->initialize (sr, parameters);
}
/// Process a file containing a list of service configuration
/// directives.
ACE_INLINE int ACE_Service_Config::process_file (const ACE_TCHAR file[])
{
return ACE_Service_Config::current ()->process_file (file);
}
///
ACE_INLINE int
ACE_Service_Config::process_directive (const ACE_TCHAR directive[])
{
return ACE_Service_Config::current ()->process_directive (directive);
}
/// Process service configuration requests as indicated in the queue of
/// svc.conf files.
ACE_INLINE int
@@ -157,7 +138,6 @@ ACE_Service_Config::process_directives (void)
{
return ACE_Service_Config::current ()->process_directives (false);
}
ACE_INLINE int
ACE_Service_Config::process_directive (const ACE_Static_Svc_Descriptor &ssd,
bool force_replace)
@@ -165,40 +145,33 @@ ACE_Service_Config::process_directive (const ACE_Static_Svc_Descriptor &ssd,
return ACE_Service_Config::current ()->process_directive (ssd, force_replace);
}
#if defined (ACE_HAS_WINCE) && defined (ACE_USES_WCHAR)
// We must provide these function to bridge Svc_Conf parser with ACE.
ACE_INLINE int
ACE_Service_Config::initialize (const ACE_Service_Type *sp, ACE_ANTI_TCHAR parameters[])
{
return ACE_Service_Config::initialize (sp, ACE_TEXT_ANTI_TO_TCHAR (parameters));
}
ACE_INLINE int
ACE_Service_Config::initialize (const ACE_ANTI_TCHAR svc_name[], ACE_ANTI_TCHAR parameters[])
{
return ACE_Service_Config::initialize (ACE_TEXT_ANTI_TO_TCHAR (svc_name),
ACE_TEXT_ANTI_TO_TCHAR (parameters));
}
ACE_INLINE int
ACE_Service_Config::resume (const ACE_ANTI_TCHAR svc_name[])
{
return ACE_Service_Config::resume (ACE_TEXT_ANTI_TO_TCHAR (svc_name));
}
ACE_INLINE int
ACE_Service_Config::suspend (const ACE_ANTI_TCHAR svc_name[])
{
return ACE_Service_Config::suspend (ACE_TEXT_ANTI_TO_TCHAR (svc_name));
}
ACE_INLINE int
ACE_Service_Config::remove (const ACE_ANTI_TCHAR svc_name[])
{
return ACE_Service_Config::remove (ACE_TEXT_ANTI_TO_TCHAR (svc_name));
}
#endif /* ACE_HAS_WINCE && !ACE_USES_WCHAR */
ACE_END_VERSIONED_NAMESPACE_DECL