From 222eaccc51b8d358c7b60d8def40d6461244ed31 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sun, 16 Aug 2015 18:08:03 +0200
Subject: Build fix for WheatyExceptionReport, c++ exceptions must not be
 thrown in SEH handlers

---
 .../shared/Debugging/WheatyExceptionReport.cpp     |  6 ++--
 src/server/shared/Logging/Appender.h               |  1 -
 src/server/shared/Revision.cpp                     | 35 ++++++++++------------
 src/server/shared/Revision.h                       | 23 +++++++-------
 4 files changed, 30 insertions(+), 35 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
index 80240bb9110..70aa23a8eed 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.cpp
+++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -130,10 +130,10 @@ PEXCEPTION_POINTERS pExceptionInfo)
     SYSTEMTIME systime;
     GetLocalTime(&systime);
     sprintf(m_szDumpFileName, "%s\\%s_%s_[%u-%u_%u-%u-%u].dmp",
-        crash_folder_path, Revision::GetHash().c_str(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
+        crash_folder_path, Revision::GetHash(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
 
     sprintf(m_szLogFileName, "%s\\%s_%s_[%u-%u_%u-%u-%u].txt",
-        crash_folder_path, Revision::GetHash().c_str(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
+        crash_folder_path, Revision::GetHash(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
 
     m_hDumpFile = CreateFile(m_szDumpFileName,
         GENERIC_WRITE,
@@ -439,7 +439,7 @@ PEXCEPTION_POINTERS pExceptionInfo)
         GetLocalTime(&systime);
 
         // Start out with a banner
-        _tprintf(_T("Revision: %s\r\n"), Revision::GetFullVersion().c_str());
+        _tprintf(_T("Revision: %s\r\n"), Revision::GetFullVersion());
         _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/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index 17bc8d4e039..7c5aa41924d 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -107,7 +107,6 @@ class Appender
 
         uint8 id;
         std::string name;
-        AppenderType type;
         LogLevel level;
         AppenderFlags flags;
 };
diff --git a/src/server/shared/Revision.cpp b/src/server/shared/Revision.cpp
index 84142316db5..22afb866165 100644
--- a/src/server/shared/Revision.cpp
+++ b/src/server/shared/Revision.cpp
@@ -2,70 +2,67 @@
 #include "CompilerDefs.h"
 #include "revision_data.h"
 
-std::string Revision::GetPackageName()
-{
-    return "TrinityCore";
-}
-
-std::string Revision::GetHash()
+char const* Revision::GetHash()
 {
     return _HASH;
 }
 
-std::string Revision::GetDate()
+char const* Revision::GetDate()
 {
     return _DATE;
 }
 
-std::string Revision::GetBranch()
+char const* Revision::GetBranch()
 {
     return _BRANCH;
 }
 
-std::string Revision::GetSourceDirectory()
+char const* Revision::GetSourceDirectory()
 {
     return _SOURCE_DIRECTORY;
 }
 
-std::string Revision::GetMySQLExecutable()
+char const* Revision::GetMySQLExecutable()
 {
     return _MYSQL_EXECUTABLE;
 }
 
-std::string Revision::GetFullDatabase()
+char const* Revision::GetFullDatabase()
 {
     return _FULL_DATABASE;
 }
 
-std::string Revision::GetFullVersion()
+#define _PACKAGENAME "TrinityCore"
+
+char const* Revision::GetFullVersion()
 {
 #if PLATFORM == PLATFORM_WINDOWS
 # ifdef _WIN64
-    return GetPackageName() + " rev. " + VER_PRODUCTVERSION_STR + " (Win64, " + _BUILD_DIRECTIVE + ")";
+    return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win64, " _BUILD_DIRECTIVE ")";
 # else
-    return GetPackageName() + " rev. " + VER_PRODUCTVERSION_STR + " (Win32, " + _BUILD_DIRECTIVE + ")";
+    return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win32, " _BUILD_DIRECTIVE ")";
 # endif
 #else
-    return GetPackageName() + " rev. " + VER_PRODUCTVERSION_STR + " (Unix, " + _BUILD_DIRECTIVE + ")";
+    return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Unix, " _BUILD_DIRECTIVE ")";
 #endif
 }
 
-std::string GetCompanyNameStr()
+char const* GetCompanyNameStr()
 {
     return VER_COMPANYNAME_STR;
 }
 
-std::string GetLegalCopyrightStr()
+char const* GetLegalCopyrightStr()
 {
     return VER_LEGALCOPYRIGHT_STR;
 }
 
-std::string GetFileVersionStr()
+char const* GetFileVersionStr()
 {
     return VER_FILEVERSION_STR;
 }
 
-std::string GetProductVersionStr()
+char const* GetProductVersionStr()
 {
     return VER_PRODUCTVERSION_STR;
 }
diff --git a/src/server/shared/Revision.h b/src/server/shared/Revision.h
index 6b80eb2ca46..f3a04540d76 100644
--- a/src/server/shared/Revision.h
+++ b/src/server/shared/Revision.h
@@ -22,18 +22,17 @@
 
 namespace Revision
 {
-    std::string GetPackageName();
-    std::string GetHash();
-    std::string GetDate();
-    std::string GetBranch();
-    std::string GetSourceDirectory();
-    std::string GetMySQLExecutable();
-    std::string GetFullDatabase();
-    std::string GetFullVersion();
-    std::string GetCompanyNameStr();
-    std::string GetLegalCopyrightStr();
-    std::string GetFileVersionStr();
-    std::string GetProductVersionStr();
+    char const* GetHash();
+    char const* GetDate();
+    char const* GetBranch();
+    char const* GetSourceDirectory();
+    char const* GetMySQLExecutable();
+    char const* GetFullDatabase();
+    char const* GetFullVersion();
+    char const* GetCompanyNameStr();
+    char const* GetLegalCopyrightStr();
+    char const* GetFileVersionStr();
+    char const* GetProductVersionStr();
 }
 
 #endif
-- 
cgit v1.2.3