From ca31e21740cf03d4f27c54250011d91b75105938 Mon Sep 17 00:00:00 2001 From: Wyk3d Date: Sat, 8 Nov 2008 22:03:17 +0200 Subject: [PATCH] [6808] Fixed VC9 build when TR1 is not present and added revision number output to the exception report --- src/framework/Utilities/UnorderedMap.h | 4 ++-- src/shared/WheatyExceptionReport.cpp | 3 ++- src/shared/revision_nr.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h index 5972faefc..a60319d5c 100644 --- a/src/framework/Utilities/UnorderedMap.h +++ b/src/framework/Utilities/UnorderedMap.h @@ -28,7 +28,7 @@ #include #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 #include -#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 #else #include @@ -37,7 +37,7 @@ #ifdef _STLPORT_VERSION #define UNORDERED_MAP 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 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 #define UNORDERED_MAP stdext::hash_map diff --git a/src/shared/WheatyExceptionReport.cpp b/src/shared/WheatyExceptionReport.cpp index cf505f8d2..d37019e08 100644 --- a/src/shared/WheatyExceptionReport.cpp +++ b/src/shared/WheatyExceptionReport.cpp @@ -15,6 +15,7 @@ #include #include "WheatyExceptionReport.h" #include "revision.h" +#include "revision_nr.h" #define CrashFolder _T("Crashs") //#pragma comment(linker, "/defaultlib:dbghelp.lib") @@ -385,7 +386,7 @@ PEXCEPTION_POINTERS pExceptionInfo ) GetLocalTime(&systime); // 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); PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index cd285a77d..9b275289f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6807" + #define REVISION_NR "6808" #endif // __REVISION_NR_H__