diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | src/mongo/db/query/plan_summary_stats.h | 4 | ||||
| -rw-r--r-- | src/mongo/util/shim_boost_assert.cpp | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 25fd4a248d0..23cff6f9da5 100644 --- a/SConstruct +++ b/SConstruct @@ -3108,10 +3108,6 @@ def doConfigure(myenv): # harmful to capture unused variables we are suppressing for now with a plan to fix later. AddToCCFLAGSIfSupported(myenv, "-Wno-unused-lambda-capture") - # This warning was added in clang-5 and incorrectly flags our implementation of - # exceptionToStatus(). See https://bugs.llvm.org/show_bug.cgi?id=34804 - AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions") - # Enable sized deallocation support. AddToCXXFLAGSIfSupported(myenv, '-fsized-deallocation') diff --git a/src/mongo/db/query/plan_summary_stats.h b/src/mongo/db/query/plan_summary_stats.h index 58677ab20d2..cfaa2053d16 100644 --- a/src/mongo/db/query/plan_summary_stats.h +++ b/src/mongo/db/query/plan_summary_stats.h @@ -29,9 +29,11 @@ #pragma once -#include "mongo/util/container_size_helper.h" +#include <optional> #include <string> +#include "mongo/util/container_size_helper.h" + namespace mongo { /** diff --git a/src/mongo/util/shim_boost_assert.cpp b/src/mongo/util/shim_boost_assert.cpp index 71ff203200e..29e565c7bba 100644 --- a/src/mongo/util/shim_boost_assert.cpp +++ b/src/mongo/util/shim_boost_assert.cpp @@ -32,6 +32,7 @@ #if defined(BOOST_ENABLE_ASSERT_DEBUG_HANDLER) && !defined(NDEBUG) #include <boost/assert.hpp> +#include <exception> namespace mongo { BoostAssertFuncs& BoostAssertFuncs::global() { |