From: Igor Sugak <sugak@fb.com>
Date: Tue, 23 Jun 2015 16:01:38 +0000 (-0700)
Subject: Remove -Wno-inconsistent-missing-override suppression in folly
X-Git-Tag: v0.48.0~25
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=01d31b9f595c37842125f9ad3104db11baa8944d

Remove -Wno-inconsistent-missing-override suppression in folly

Summary: It is fixed in gmock. No need to suppress it in sources.

Reviewed By: @meyering

Differential Revision: D2181564
---

diff --git a/folly/wangle/channel/test/MockHandler.h b/folly/wangle/channel/test/MockHandler.h
index 5a476646..eb5f44ce 100644
--- a/folly/wangle/channel/test/MockHandler.h
+++ b/folly/wangle/channel/test/MockHandler.h
@@ -29,13 +29,6 @@ class MockHandler : public Handler<Rin, Rout, Win, Wout> {
   MockHandler() = default;
   MockHandler(MockHandler&&) = default;
 
-#ifdef __clang__
-# pragma clang diagnostic push
-# if __clang_major__ > 3 || __clang_minor__ >= 6
-#  pragma clang diagnostic ignored "-Winconsistent-missing-override"
-# endif
-#endif
-
   MOCK_METHOD2_T(read_, void(Context*, Rin&));
   MOCK_METHOD1_T(readEOF, void(Context*));
   MOCK_METHOD2_T(readException, void(Context*, exception_wrapper));
@@ -48,10 +41,6 @@ class MockHandler : public Handler<Rin, Rout, Win, Wout> {
   MOCK_METHOD1_T(detachPipeline, void(Context*));
   MOCK_METHOD1_T(detachTransport, void(Context*));
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
   void read(Context* ctx, Rin msg) override {
     read_(ctx, msg);
   }