zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,827 Commits 1 Branch 0 Tags
1323fc39babb2638c5795c1e23e97c977c5c29f3
Commit Graph

2 Commits

Author SHA1 Message Date
henrikg
3c089d751e Add RTC_ prefix to contructormagic macros. 
We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition.

* DISALLOW_ASSIGN -> RTC_DISALLOW_ASSIGN
* DISALLOW_COPY_AND_ASSIGN -> RTC_DISALLOW_COPY_AND_ASSIGN
* DISALLOW_IMPLICIT_CONSTRUCTORS -> RTC_DISALLOW_IMPLICIT_CONSTRUCTORS

Related CL: https://codereview.webrtc.org/1335923002/

BUG=chromium:468375
NOTRY=true

Review URL: https://codereview.webrtc.org/1345433002

Cr-Commit-Position: refs/heads/master@{#9953}
 2015-09-16 12:37:52 +00:00
pbos@webrtc.org
9f79fe684a Merge remote bitrate estimator changes. 
R=stefan@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/33489004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7811 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-12-04 15:34:06 +00:00