mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-02-13 23:43:44 +00:00
chore(Deps/Acelite): Update to 6.5.10 (#3450)
This commit is contained in:
25
deps/acelite/ace/Object_Manager.cpp
vendored
25
deps/acelite/ace/Object_Manager.cpp
vendored
@@ -4,8 +4,8 @@
|
||||
#endif /* ! ACE_LACKS_ACE_TOKEN */
|
||||
#include "ace/Thread_Manager.h"
|
||||
#if !defined (ACE_LACKS_ACE_SVCCONF)
|
||||
# include "ace/Service_Manager.h"
|
||||
# include "ace/Service_Config.h"
|
||||
# include "ace/Service_Manager.h"
|
||||
# include "ace/Service_Config.h"
|
||||
#endif /* ! ACE_LACKS_ACE_SVCCONF */
|
||||
#include "ace/Signal.h"
|
||||
#include "ace/Log_Category.h"
|
||||
@@ -29,7 +29,8 @@
|
||||
#include "ace/Mutex.h"
|
||||
#include "ace/RW_Thread_Mutex.h"
|
||||
#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE)
|
||||
#include "ace/OS_NS_stdlib.h"
|
||||
# include "ace/OS_NS_stdlib.h"
|
||||
# include /**/ <crtdbg.h>
|
||||
#endif // ACE_DISABLE_WIN32_ERROR_WINDOWS
|
||||
|
||||
#if ! defined (ACE_APPLICATION_PREALLOCATED_OBJECT_DEFINITIONS)
|
||||
@@ -119,6 +120,8 @@ public:
|
||||
ACE_Object_Manager_Preallocations (void);
|
||||
~ACE_Object_Manager_Preallocations (void);
|
||||
|
||||
ACE_ALLOC_HOOK_DECLARE;
|
||||
|
||||
private:
|
||||
ACE_Static_Svc_Descriptor ace_svc_desc_ACE_Service_Manager;
|
||||
};
|
||||
@@ -147,6 +150,8 @@ ACE_Object_Manager_Preallocations::~ACE_Object_Manager_Preallocations (void)
|
||||
{
|
||||
}
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_Object_Manager_Preallocations)
|
||||
|
||||
#endif /* ! ACE_LACKS_ACE_SVCCONF */
|
||||
|
||||
int
|
||||
@@ -163,14 +168,14 @@ ACE_Object_Manager::shutting_down (void)
|
||||
|
||||
#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS)
|
||||
// Instead of popping up a window for exceptions, just print something out
|
||||
LONG _stdcall ACE_UnhandledExceptionFilter (PEXCEPTION_POINTERS pExceptionInfo)
|
||||
LONG WINAPI ACE_UnhandledExceptionFilter (PEXCEPTION_POINTERS pExceptionInfo)
|
||||
{
|
||||
DWORD dwExceptionCode = pExceptionInfo->ExceptionRecord->ExceptionCode;
|
||||
DWORD const dwExceptionCode = pExceptionInfo->ExceptionRecord->ExceptionCode;
|
||||
|
||||
if (dwExceptionCode == EXCEPTION_ACCESS_VIOLATION)
|
||||
ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: ACCESS VIOLATION\n")));
|
||||
ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("\n(%P|%t) ERROR: ACCESS VIOLATION\n")));
|
||||
else
|
||||
ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: UNHANDLED EXCEPTION\n")));
|
||||
ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("\n(%P|%t) ERROR: UNHANDLED EXCEPTION\n")));
|
||||
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
@@ -318,7 +323,6 @@ ACE_Object_Manager::init (void)
|
||||
# endif // (_MSC_VER >= 1400) // VC++ 8.0 and above.
|
||||
#endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS */
|
||||
|
||||
|
||||
# if !defined (ACE_LACKS_ACE_SVCCONF)
|
||||
ACE_NEW_RETURN (preallocations_,
|
||||
ACE_Object_Manager_Preallocations,
|
||||
@@ -412,6 +416,8 @@ ACE_Object_Manager::~ACE_Object_Manager (void)
|
||||
fini ();
|
||||
}
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_Object_Manager)
|
||||
|
||||
ACE_Object_Manager *
|
||||
ACE_Object_Manager::instance (void)
|
||||
{
|
||||
@@ -887,13 +893,10 @@ static ACE_Object_Manager_Manager ACE_Object_Manager_Manager_instance;
|
||||
|
||||
#if defined (ACE_HAS_THREADS)
|
||||
|
||||
// hack to get around errors while compiling using split-cpp
|
||||
#if !defined (ACE_IS_SPLITTING)
|
||||
// This is global so that it doesn't have to be declared in the header
|
||||
// file. That would cause nasty circular include problems.
|
||||
typedef ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> ACE_Static_Object_Lock_Type;
|
||||
static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock = 0;
|
||||
#endif /* ! ACE_IS_SPLITTING */
|
||||
|
||||
// ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK isn't (currently) used by ACE.
|
||||
// But, applications may find it useful for avoiding recursive calls
|
||||
|
||||
Reference in New Issue
Block a user