diff options
| author | Shauren <none@none> | 2010-08-11 16:59:36 +0200 |
|---|---|---|
| committer | Shauren <none@none> | 2010-08-11 16:59:36 +0200 |
| commit | 24031cd6b98925c744c633348abebcb3225c46b5 (patch) | |
| tree | ae0038c789e94e021506f17d44016021da7a72c8 /src/server/shared/Debugging | |
| parent | c53bec73f1a5f984392dfc55c704ca469d7ec980 (diff) | |
Buildsystem: Removed unused MemoryLeaks files
Buildsystem/Windows: WheatyExceptionReport is now build in worldserver and authserver instead of shared (fixes crash reports not being generated)
--HG--
branch : trunk
Diffstat (limited to 'src/server/shared/Debugging')
| -rw-r--r-- | src/server/shared/Debugging/MemoryLeaks.cpp | 29 | ||||
| -rw-r--r-- | src/server/shared/Debugging/MemoryLeaks.h | 49 | ||||
| -rw-r--r-- | src/server/shared/Debugging/WheatyExceptionReport.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Debugging/WheatyExceptionReport.h | 2 |
4 files changed, 3 insertions, 81 deletions
diff --git a/src/server/shared/Debugging/MemoryLeaks.cpp b/src/server/shared/Debugging/MemoryLeaks.cpp deleted file mode 100644 index c591dabb866..00000000000 --- a/src/server/shared/Debugging/MemoryLeaks.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "MemoryLeaks.h" - -MemoryManager::MemoryManager( ) -{ - #if COMPILER == MICROSOFT - // standard leak check initialization - //_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); - // uncomment to disable Visual Leak Detector from code - //VLDDisable(); - #endif -} diff --git a/src/server/shared/Debugging/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h deleted file mode 100644 index 4b13e4d3d90..00000000000 --- a/src/server/shared/Debugging/MemoryLeaks.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef TRINITYSERVER_MEMORY_H -#define TRINITYSERVER_MEMORY_H - -#include "shared/CompilerDefs.h" - -#if COMPILER == COMPILER_MICROSOFT - -#ifndef _WIN64 -// Visual Leak Detector support enabled -//#include <vld/vld.h> -// standard Visual Studio leak check disabled, -//# define _CRTDBG_MAP_ALLOC -//# include <stdlib.h> -//# include <crtdbg.h> -#else -//# define _CRTDBG_MAP_ALLOC -//# include <stdlib.h> -//# include <crtdbg.h> -#endif - -#endif - - -#include "ace/Singleton.h" - -struct MemoryManager -{ - MemoryManager(); -}; -#define sMemoryManager ACE_Singleton<MemoryManager, ACE_Null_Mutex>::instance() -#endif diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp index ebc6a701996..7a3eae0f408 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.cpp +++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp @@ -3,7 +3,7 @@ // MSDN Magazine, 2002 // FILE: WheatyExceptionReport.CPP //========================================== -#ifdef _WIN32 +#if PLATFORM == PLATFORM_WINDOWS #define WIN32_LEAN_AND_MEAN #pragma warning(disable:4996) #pragma warning(disable:4312) @@ -18,7 +18,7 @@ #include "SystemConfig.h" #include "revision.h" #define CrashFolder _T("Crashes") -//#pragma comment(linker, "/defaultlib:dbghelp.lib") +#pragma comment(linker, "/DEFAULTLIB:dbghelp.lib") inline LPTSTR ErrorMessage(DWORD dw) { diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h index e9af3f21d24..228d260e57d 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.h +++ b/src/server/shared/Debugging/WheatyExceptionReport.h @@ -1,7 +1,7 @@ #ifndef _WHEATYEXCEPTIONREPORT_ #define _WHEATYEXCEPTIONREPORT_ -#ifdef _WIN32 +#if PLATFORM == PLATFORM_WINDOWS #include <dbghelp.h> |
