third_party/libjingle/overrides/talk/base/constructormagic.h - Issue 435823002: Revert "Update webrtc&libjingle 6774:6799."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

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

new file mode 100644

index 0000000000000000000000000000000000000000..012357e094902288160257987c8ff7178b990856

--- /dev/null

+++ b/third_party/libjingle/overrides/talk/base/constructormagic.h

@@ -0,0 +1,14 @@

+// 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__