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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/overrides/webrtc/base/constructormagic.h
diff --git a/webrtc/overrides/webrtc/base/constructormagic.h b/webrtc/overrides/webrtc/base/constructormagic.h
deleted file mode 100644
index d6ca07a6f1ae7d4142ae0032026581da509e9d43..0000000000000000000000000000000000000000
--- a/webrtc/overrides/webrtc/base/constructormagic.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2009 The WebRTC Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file overrides the inclusion of webrtc/base/constructormagic.h
-// We do this because constructor magic defines RTC_DISALLOW_COPY_AND_ASSIGN,
-// but we want to use the version from Chromium.
-
-#ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
-#define OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
-
-#include "base/macros.h"
-
-#endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
« 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