SERVER-17414 Disable warnings with optimized code generation

2 files changed, 8 insertions, 0 deletions

diff --git a/src/mongo/db/storage/mmap_v1/dur_recover.cpp b/src/mongo/db/storage/mmap_v1/dur_recover.cpp
index 2b4424ae9c8..936766f0160 100644
--- a/src/mongo/db/storage/mmap_v1/dur_recover.cpp
+++ b/src/mongo/db/storage/mmap_v1/dur_recover.cpp
@@ -265,9 +265,13 @@ RecoveryJob::RecoveryJob()
       _lastSeqSkipped(0),
       _appliedAnySections(false) {}
 
+#pragma warning(push)
+// C4722: 'mongo::dur::RecoveryJob::~RecoveryJob': destructor never returns, potential memory leak
+#pragma warning(disable : 4722)
 RecoveryJob::~RecoveryJob() {
     invariant(!"RecoveryJob is intentionally leaked with a bare call to operator new()");
 }
+#pragma warning(pop)
 
 void RecoveryJob::close(OperationContext* opCtx) {
     stdx::lock_guard<stdx::mutex> lk(_mx);
diff --git a/src/third_party/s2/base/logging.cc b/src/third_party/s2/base/logging.cc
index 503037c89e7..bbf060e8237 100755
--- a/src/third_party/s2/base/logging.cc
+++ b/src/third_party/s2/base/logging.cc
@@ -38,7 +38,11 @@ LogMessageWarning::LogMessageWarning(const char* file, int line) :
 LogMessageFatal::LogMessageFatal(const char* file, int line) :
         LogMessageBase(mongo::severe(), file, line) { }
 
+#pragma warning(push)
+// C4722: 'LogMessageFatal::~LogMessageFatal': destructor never returns, potential memory leak
+#pragma warning(disable : 4722)
 LogMessageFatal::~LogMessageFatal() {
     _lsb.~LogstreamBuilder();
     fassertFailed(40048);
 }
+#pragma warning(pop)