From dc8dcb4b8caee86d3fa8b31f1f0bfaf9702a3edb Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 17 Sep 2014 07:44:33 +0000 Subject: [PATCH] Narrower include for constructormagic.h in Chromium. Replacing #include of "base/basictypes.h" in overrides/webrtc/base/constructormagic.h with "base/macros.h". Our version of constructormagic.h is not meant to include the base types, only DISALLOW_COPY_AND_ASSIGN etc. This fix is also a workaround for our overrides in Chromium seemingly including the wrong things for certain webrtc targets like audio_processing, so it looks like this #include "base/basictypes.h" didn't include Chromium's base/basictypes.h but webrtc/base/basictypes.h somehow, hence DISALLOW_COPY_AND_ASSIGN wasn't defined, causing the revert in r7151. R=henrike@webrtc.org, tommi@webrtc.org BUG=3070 TEST=Chromium still builds locally with this change. Review URL: https://webrtc-codereview.appspot.com/27509004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7204 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 1 + webrtc/overrides/webrtc/base/constructormagic.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 271a49f874..ccc34298fb 100644 --- a/DEPS +++ b/DEPS @@ -50,6 +50,7 @@ skip_child_includes = [ 'gflags', 'testing', 'third_party', + 'webrtc/overrides', ] hooks = [ diff --git a/webrtc/overrides/webrtc/base/constructormagic.h b/webrtc/overrides/webrtc/base/constructormagic.h index bb89f91f1f..72b334c18e 100644 --- a/webrtc/overrides/webrtc/base/constructormagic.h +++ b/webrtc/overrides/webrtc/base/constructormagic.h @@ -15,6 +15,6 @@ #ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ #define OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ -#include "base/basictypes.h" +#include "base/macros.h" #endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__