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

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

Issue 1342543004: Consolidate constructormagic macros with Chromium version and remove Chromium override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. 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 | « webrtc/modules/video_coding/main/test/test_util.h ('k') | 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
(Empty)
1 /*
2 * Copyright 2009 The WebRTC Project Authors. All rights reserved.
3 *
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
6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree.
9 */
10
11 // This file overrides the inclusion of webrtc/base/constructormagic.h
12 // We do this because constructor magic defines RTC_DISALLOW_COPY_AND_ASSIGN,
13 // but we want to use the version from Chromium.
14
15 #ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
16 #define OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
17
18 #include "base/macros.h"
19
20 #endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/main/test/test_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698