diff options
| author | henrikg <henrikg@webrtc.org> | 2015-09-16 05:37:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 12:37:52 +0000 |
| commit | 3c089d751ede283e21e186885eaf705c3257ccd2 (patch) | |
| tree | 3ee93b396d9059325a36878e5108f02432f34c04 /talk/app/webrtc/mediacontroller.cc | |
| parent | afb6b5e3e0a2d7040e183d09e40071074017c0ad (diff) | |
| download | webrtc-3c089d751ede283e21e186885eaf705c3257ccd2.tar.gz | |
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}
Diffstat (limited to 'talk/app/webrtc/mediacontroller.cc')
| -rw-r--r-- | talk/app/webrtc/mediacontroller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/talk/app/webrtc/mediacontroller.cc b/talk/app/webrtc/mediacontroller.cc index d8c9b52095..ff21314689 100644 --- a/talk/app/webrtc/mediacontroller.cc +++ b/talk/app/webrtc/mediacontroller.cc @@ -74,7 +74,7 @@ class MediaController : public webrtc::MediaControllerInterface { rtc::Thread* worker_thread_; rtc::scoped_ptr<webrtc::Call> call_; - DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController); }; } // namespace { |