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

Unified Diff: third_party/libjingle/overrides/talk/base/constructormagic.h

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DEPS file Created 6 years, 5 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
Index: third_party/libjingle/overrides/talk/base/constructormagic.h
diff --git a/third_party/libjingle/overrides/talk/base/constructormagic.h b/third_party/libjingle/overrides/talk/base/constructormagic.h
deleted file mode 100644
index 012357e094902288160257987c8ff7178b990856..0000000000000000000000000000000000000000
--- a/third_party/libjingle/overrides/talk/base/constructormagic.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file overrides the inclusion of talk/base/constructormagic.h
-// We do this because constructor magic defines DISALLOW_EVIL_CONSTRUCTORS,
-// but we want to use the version from Chromium.
-
-#ifndef OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__
-#define OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__
-
-#include "base/basictypes.h"
-
-#endif // OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__

Powered by Google App Engine
This is Rietveld 408576698