From: Nate Stedman <natesm@fb.com>
Date: Sat, 1 Jul 2017 01:01:42 +0000 (-0700)
Subject: Fix undefined warning errors
X-Git-Tag: v2017.07.03.00~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b8ac5f35d9b1cfd00990691efed19682c5d1eabf;p=folly.git

Fix undefined warning errors

Summary: Xcode 9 is throwing errors because `-Wshadow-local` and `-Wshadow-compatible-local` are undefined in Clang.

Reviewed By: Orvid

Differential Revision: D5356476

fbshipit-source-id: 4cc9f48f796f66decb4beaa66d3e66f486449c19
---

diff --git a/folly/ExceptionWrapper.h b/folly/ExceptionWrapper.h
index 958a3d31..3a2ff717 100644
--- a/folly/ExceptionWrapper.h
+++ b/folly/ExceptionWrapper.h
@@ -34,6 +34,7 @@
 #include <folly/Demangle.h>
 #include <folly/ExceptionString.h>
 #include <folly/FBString.h>
+#include <folly/Portability.h>
 #include <folly/Traits.h>
 
 #ifdef __GNUC__
@@ -42,8 +43,7 @@
 #pragma GCC diagnostic ignored "-Wpotentially-evaluated-expression"
 // GCC gets confused about lambda scopes and issues shadow-local warnings for
 // parameters in totally different functions.
-#pragma GCC diagnostic ignored "-Wshadow-local"
-#pragma GCC diagnostic ignored "-Wshadow-compatible-local"
+FOLLY_GCC_DISABLE_NEW_SHADOW_WARNINGS
 #endif
 
 #define FOLLY_EXCEPTION_WRAPPER_H_INCLUDED