pkgs/servers/nosql/mongodb/fix-gcc-Wno-exceptions-5.0.patch

   1 From e78b2bf6eaa0c43bd76dbb841add167b443d2bb0 Mon Sep 17 00:00:00 2001
   2 From: Mark Benvenuto <mark.benvenuto@mongodb.com>
   3 Date: Mon, 21 Jun 2021 11:36:56 -0400
   4 Subject: [PATCH] SERVER-57688 Fix debug gcc 11 and clang 12 builds on Fedora
   5  34
   6
   7 ---
   8  SConstruct                              | 4 ----
   9  src/mongo/db/query/plan_summary_stats.h | 4 +++-
  10  src/mongo/util/shim_boost_assert.cpp    | 1 +
  11  3 files changed, 4 insertions(+), 5 deletions(-)
  12
  13 diff --git a/SConstruct b/SConstruct
  14 index 25fd4a248d0c..23cff6f9da53 100644
  15 --- a/SConstruct
  16 +++ b/SConstruct
  17 @@ -3108,10 +3108,6 @@ def doConfigure(myenv):
  18          # harmful to capture unused variables we are suppressing for now with a plan to fix later.
  19          AddToCCFLAGSIfSupported(myenv, "-Wno-unused-lambda-capture")
  20
  21 -        # This warning was added in clang-5 and incorrectly flags our implementation of
  22 -        # exceptionToStatus(). See https://bugs.llvm.org/show_bug.cgi?id=34804
  23 -        AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions")
  24 -
  25          # Enable sized deallocation support.
  26          AddToCXXFLAGSIfSupported(myenv, '-fsized-deallocation')
  27
  28 diff --git a/src/mongo/db/query/plan_summary_stats.h b/src/mongo/db/query/plan_summary_stats.h
  29 index 58677ab20d25..cfaa2053d16f 100644
  30 --- a/src/mongo/db/query/plan_summary_stats.h
  31 +++ b/src/mongo/db/query/plan_summary_stats.h
  32 @@ -29,9 +29,11 @@
  33
  34  #pragma once
  35
  36 -#include "mongo/util/container_size_helper.h"
  37 +#include <optional>
  38  #include <string>
  39
  40 +#include "mongo/util/container_size_helper.h"
  41 +
  42  namespace mongo {
  43
  44  /**