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

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

Issue 10209008: Roll libjingle 132:133 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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
« remoting/protocol/jingle_messages.h ('K') | « third_party/libjingle/libjingle.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/overrides/talk/base/scoped_ptr.h
diff --git a/third_party/libjingle/overrides/talk/base/scoped_ptr.h b/third_party/libjingle/overrides/talk/base/scoped_ptr.h
deleted file mode 100644
index 3d396d1e63ec4a764e7c7f7ae820b16081ecdfbb..0000000000000000000000000000000000000000
--- a/third_party/libjingle/overrides/talk/base/scoped_ptr.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2011 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/memory/scoped_ptr.h. We use
-// a version of scoped_ptr from Chromium base, to avoid multiple definitions.
-
-#ifndef OVERRIDES_TALK_BASE_SCOPED_PTR_H_
-#define OVERRIDES_TALK_BASE_SCOPED_PTR_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "talk/base/common.h"
-
-namespace talk_base {
-
-using ::scoped_ptr;
-using ::scoped_array;
-
-} // namespace talk_base
-
-#endif // OVERRIDES_TALK_BASE_SCOPED_PTR_H_
« remoting/protocol/jingle_messages.h ('K') | « third_party/libjingle/libjingle.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698