| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 // This file overrides the inclusion of webrtc/base/constructormagic.h | 11 // This file overrides the inclusion of webrtc/base/constructormagic.h |
| 12 // We do this because constructor magic defines DISALLOW_COPY_AND_ASSIGN, | 12 // We do this because constructor magic defines RTC_DISALLOW_COPY_AND_ASSIGN, |
| 13 // but we want to use the version from Chromium. | 13 // but we want to use the version from Chromium. |
| 14 | 14 |
| 15 #ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ | 15 #ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ |
| 16 #define OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ | 16 #define OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ |
| 17 | 17 |
| 18 #include "base/macros.h" | 18 #include "base/macros.h" |
| 19 | 19 |
| 20 #endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ | 20 #endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1345433002:
Add RTC_ prefix to contructormagic macros. (Closed)
Base URL: https://chromium.googlesource.com/external/webrtc.git@master