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

Side by Side 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, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file overrides the inclusion of talk/base/memory/scoped_ptr.h. We use 5 #include "third_party/libjingle/source/talk/base/scoped_ptr.h"
6 // a version of scoped_ptr from Chromium base, to avoid multiple definitions.
7
8 #ifndef OVERRIDES_TALK_BASE_SCOPED_PTR_H_
9 #define OVERRIDES_TALK_BASE_SCOPED_PTR_H_
10
11 #include "base/memory/scoped_ptr.h"
12 #include "talk/base/common.h"
13
14 namespace talk_base {
15
16 using ::scoped_ptr;
17 using ::scoped_array;
18
19 } // namespace talk_base
20
21 #endif // OVERRIDES_TALK_BASE_SCOPED_PTR_H_
OLDNEW
« no previous file with comments | « third_party/libjingle/overrides/talk/base/byteorder.h ('k') | third_party/libjingle/overrides/talk/base/win32.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698