generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Narrower include for constructormagic.h in Chromium.

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2014-09-17 07:44:33 +00:00
parent eb43264f26
commit dc8dcb4b8c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DEPS
View File

@ -50,6 +50,7 @@ skip_child_includes = [
'gflags', 'gflags',
'testing', 'testing',
'third_party', 'third_party',
'webrtc/overrides',
] ]
hooks = [ hooks = [

2
webrtc/overrides/webrtc/base/constructormagic.h
View File

@ -15,6 +15,6 @@
#ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ #ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
#define 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__ #endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__