0003.patch (1689B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Thu, 20 Oct 2022 16:14:00 +0000 3 Subject: Bug 1795982 - pt5 - turn off -Wcomma warning for 4 third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view.h r=ng 5 6 abseil-cpp/absl/strings/string_view.h has multiple usages that follow a 7 pattern similar to: 8 return ABSL_HARDENING_ASSERT(i < size()), ptr_[i]; 9 10 This causes Mozilla builds to fail because of -Wcomma warnings. For 11 this file, we'll turn off that warning. 12 13 Differential Revision: https://phabricator.services.mozilla.com/D159742 14 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/da4def20e294cf6b5b4ae9ef38ddeb3c8302fe3c 15 --- 16 abseil-cpp/absl/strings/string_view.h | 13 +++++++++++++ 17 1 file changed, 13 insertions(+) 18 19 diff --git a/abseil-cpp/absl/strings/string_view.h b/abseil-cpp/absl/strings/string_view.h 20 index b05c036b0cc..7d778cbb034 100644 21 --- a/abseil-cpp/absl/strings/string_view.h 22 +++ b/abseil-cpp/absl/strings/string_view.h 23 @@ -67,6 +67,15 @@ ABSL_NAMESPACE_END 24 namespace absl { 25 ABSL_NAMESPACE_BEGIN 26 27 +// Mozilla added - quiets misused comma warnings resulting from 28 +// frequent use of the pattern: 29 +// return ABSL_HARDENING_ASSERT(i < size()), ptr_[i]; 30 +// TODO: https://bugzilla.mozilla.org/show_bug.cgi?id=1796623 31 +#if defined(__clang__) 32 +#pragma clang diagnostic push 33 +#pragma clang diagnostic ignored "-Wcomma" 34 +#endif 35 + 36 // absl::string_view 37 // 38 // A `string_view` provides a lightweight view into the string data provided by 39 @@ -737,6 +746,10 @@ ABSL_NAMESPACE_END 40 41 #undef ABSL_INTERNAL_STRING_VIEW_MEMCMP 42 43 +#if defined(__clang__) 44 +#pragma clang diagnostic pop 45 +#endif 46 + 47 #endif // ABSL_USES_STD_STRING_VIEW 48 49 namespace absl {