summaryrefslogtreecommitdiff
path: root/src/mongo/util/stacktrace_windows.cpp
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2017-10-20 17:11:32 -0400
committerMark Benvenuto <mark.benvenuto@mongodb.com>2017-10-20 17:11:32 -0400
commit98c383e7e7b7f7e0bc9964e3d18f9aaa3539ff59 (patch)
tree6f6c8fbe44d49e129b836b7426a6f7c05bb05586 /src/mongo/util/stacktrace_windows.cpp
parentf13e5ad084191e1b38992817c5796bbf6e6e9551 (diff)
downloadmongo-98c383e7e7b7f7e0bc9964e3d18f9aaa3539ff59.tar.gz
SERVER-17414 Enable Warnings As Errors on Windows, and disable/fix warnings
Diffstat (limited to 'src/mongo/util/stacktrace_windows.cpp')
-rw-r--r--src/mongo/util/stacktrace_windows.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mongo/util/stacktrace_windows.cpp b/src/mongo/util/stacktrace_windows.cpp
index ae0ed8a0997..a2a2ea29162 100644
--- a/src/mongo/util/stacktrace_windows.cpp
+++ b/src/mongo/util/stacktrace_windows.cpp
@@ -31,7 +31,12 @@
#include "mongo/util/stacktrace.h"
+#pragma warning(push)
+// C4091: 'typedef ': ignored on left of '' when no variable is declared
+#pragma warning(disable : 4091)
#include <DbgHelp.h>
+#pragma warning(pop)
+
#include <boost/filesystem/operations.hpp>
#include <boost/optional.hpp>
#include <cstdio>
@@ -213,7 +218,7 @@ static void getsymbolAndOffset(HANDLE process,
std::string symbolString(symbolInfo->Name);
static const size_t bufferSize = 32;
std::unique_ptr<char[]> symbolOffset(new char[bufferSize]);
- _snprintf(symbolOffset.get(), bufferSize, "+0x%x", displacement64);
+ _snprintf(symbolOffset.get(), bufferSize, "+0x%llux", displacement64);
symbolString += symbolOffset.get();
returnedSymbolAndOffset->swap(symbolString);
}