Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1481)

Side by Side Diff: webrtc/overrides/webrtc/base/constructormagic.h

Issue 1345193002: Temporarily define RTC_DISALLOW_ASSIGN in Chromium constructormagic override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 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 #define RTC_DISALLOW_ASSIGN(TypeName) \
21 DISALLOW_ASSIGN(TypeName)
22
23 #define RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) \
24 DISALLOW_COPY_AND_ASSIGN(TypeName)
25
26 #define RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
27 DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName)
28
20 #endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ 29 #endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698