diff options
| author | Tannin <devnull@localhost> | 2015-03-09 12:34:34 +0100 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2015-03-09 12:34:34 +0100 |
| commit | 7a1ae9b0f1560c9eda32e032796fbb3fd56ff236 (patch) | |
| tree | dea71435ac1042cb008fcd9f7b1ec57e6ea91227 /src/shared/stackdata.cpp | |
| parent | d45ebf134819e1559718681becca9c4139fb7151 (diff) | |
| parent | db2954e8eb41da715b9e7d79a72e225797401413 (diff) | |
Merge with branch1.2
Diffstat (limited to 'src/shared/stackdata.cpp')
| -rw-r--r-- | src/shared/stackdata.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/shared/stackdata.cpp b/src/shared/stackdata.cpp index 016fb346..43acd90a 100644 --- a/src/shared/stackdata.cpp +++ b/src/shared/stackdata.cpp @@ -1,9 +1,9 @@ #include "stackdata.h"
+#include "util.h"
#include <DbgHelp.h>
#include <sstream>
#include <TlHelp32.h>
-#include <util.h>
#include <set>
#include "error_report.h"
#include <boost/predef.h>
@@ -135,7 +135,6 @@ void StackData::initTrace() { }
}
-#pragma warning( enable : 4748 )
bool MOShared::operator==(const StackData &LHS, const StackData &RHS) {
if (LHS.m_Count != RHS.m_Count) {
|