mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[6808] Fixed VC9 build when TR1 is not present and added revision number output to the exception report

Browse source
This commit is contained in:
Wyk3d 2008-11-08 22:03:17 +02:00
parent 82ad991969
commit ca31e21740
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/framework/Utilities/UnorderedMap.h
View file

@ -28,7 +28,7 @@
#include <tr1/unordered_map> #include <tr1/unordered_map>
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
#include <ext/hash_map> #include <ext/hash_map>
#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 // VC9.0 and later #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1 // VC9.0 SP1 and later
#include <unordered_map> #include <unordered_map>
#else #else
#include <hash_map> #include <hash_map>
@ -37,7 +37,7 @@
#ifdef _STLPORT_VERSION #ifdef _STLPORT_VERSION
#define UNORDERED_MAP std::hash_map #define UNORDERED_MAP std::hash_map
using std::hash_map; using std::hash_map;
#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1
#define UNORDERED_MAP std::tr1::unordered_map #define UNORDERED_MAP std::tr1::unordered_map
#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300
#define UNORDERED_MAP stdext::hash_map #define UNORDERED_MAP stdext::hash_map

3
src/shared/WheatyExceptionReport.cpp
View file

@ -15,6 +15,7 @@
#include <dbghelp.h> #include <dbghelp.h>
#include "WheatyExceptionReport.h" #include "WheatyExceptionReport.h"
#include "revision.h" #include "revision.h"
#include "revision_nr.h"
#define CrashFolder _T("Crashs") #define CrashFolder _T("Crashs")
//#pragma comment(linker, "/defaultlib:dbghelp.lib") //#pragma comment(linker, "/defaultlib:dbghelp.lib")
@ -385,7 +386,7 @@ PEXCEPTION_POINTERS pExceptionInfo )
GetLocalTime(&systime); GetLocalTime(&systime);
// Start out with a banner // Start out with a banner
_tprintf(_T("Revision: %s %s %s\r\n"), REVISION_DATE, REVISION_TIME, REVISION_ID); _tprintf(_T("Revision: %s %s %s %s\r\n"), REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID);
_tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute); _tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute);
PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord; PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "6807" #define REVISION_NR "6808"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__