diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2014-09-17 07:44:33 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2014-09-17 07:44:33 +0000 |
| commit | c72efb44504f96fbb607b6ff155b09830faf2cdb (patch) | |
| tree | 426ea579a779f93144767e493d7e49777c062669 /overrides/webrtc | |
| parent | 170b1f34825064315e4b2a8760433516697363b1 (diff) | |
| download | webrtc-c72efb44504f96fbb607b6ff155b09830faf2cdb.tar.gz | |
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/webrtc@7204 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'overrides/webrtc')
| -rw-r--r-- | overrides/webrtc/base/constructormagic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/overrides/webrtc/base/constructormagic.h b/overrides/webrtc/base/constructormagic.h index bb89f91f..72b334c1 100644 --- a/overrides/webrtc/base/constructormagic.h +++ b/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__ |