From 4996eaa7a27f1da95ca8027164c4a291bce9ba36 Mon Sep 17 00:00:00 2001 From: nisse Date: Tue, 10 May 2016 23:28:10 -0700 Subject: [PATCH] =?UTF-8?q?Revert=20of=20Partial=20revert=20of=20Enable=20?= =?UTF-8?q?-Winconsistent-missing-override=20flag.=20(patchset=20#5=20id:8?= =?UTF-8?q?0001=20of=20https://cod=E2=80=A6=20(patchset=20#1=20id:1=20of?= =?UTF-8?q?=20https://codereview.webrtc.org/1944273002/=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reason for revert: Downstream users updated now. Original issue's description: > Partial revert of Enable -Winconsistent-missing-override flag. (patchset #5 id:80001 of https://codereview.webrtc.org/1921653002/ ) > > Reason for revert: > This CL breaks the google3 import (but not the import bot). > This partial revert only reverts the build files. A full revert no longer cleanly applies to ToT, so this was done instead. > > Original issue's description: > > Enable -Winconsistent-missing-override flag. > > > > The problem with gmock is worked around by commenting out any other override declarations in classes using gmock. > > > > NOPRESUBMIT=True > > BUG=webrtc:3970 > > > > Committed: https://crrev.com/ef8b61e11062295365f11b9942f18a08a8b3ec60 > > Cr-Commit-Position: refs/heads/master@{#12563} > > TBR=mflodman@webrtc.org,kjellander@webrtc.org,nisse@webrtc.org > BUG=webrtc:3970 > > Committed: https://crrev.com/053f91774149a5367ddd531999d4ca69a57dbaa3 > Cr-Commit-Position: refs/heads/master@{#12624} TBR=kjellander@webrtc.org,mflodman@webrtc.org,ivoc@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:3970 NOTRY=True Review-Url: https://codereview.webrtc.org/1959353002 Cr-Commit-Position: refs/heads/master@{#12678} --- webrtc/BUILD.gn | 1 + webrtc/build/common.gypi | 1 + 2 files changed, 2 insertions(+) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 3ae09da2c9..b31a07c83d 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -117,6 +117,7 @@ config("common_config") { cflags += [ "-Wimplicit-fallthrough", "-Wthread-safety", + "-Winconsistent-missing-override", ] } } diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index f8446d9f91..5335cc8b16 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -313,6 +313,7 @@ 'cflags': [ '-Wimplicit-fallthrough', '-Wthread-safety', + '-Winconsistent-missing-override', ], }], ],