From bd6bdca57fd457bd7b950a238ffd35b17a4e58d0 Mon Sep 17 00:00:00 2001
From: "henrike@webrtc.org" <henrike@webrtc.org>
Date: Tue, 28 Oct 2014 18:06:42 +0000
Subject: [PATCH] scoped_ptr.h: Renames function and change namespace scope to
 fix conflicts with Chromium not detected by the FYI bots.

BUG=N/A
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/23259004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7546 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/system_wrappers/interface/scoped_ptr.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/webrtc/system_wrappers/interface/scoped_ptr.h b/webrtc/system_wrappers/interface/scoped_ptr.h
index 3ca755c07..1beca1b88 100644
--- a/webrtc/system_wrappers/interface/scoped_ptr.h
+++ b/webrtc/system_wrappers/interface/scoped_ptr.h
@@ -567,18 +567,20 @@ class scoped_ptr<T[], D> {
   template <class U> bool operator!=(scoped_ptr<U> const& p2) const;
 };
 
+}  // namespace webrtc
+
 template <class T, class D>
-void swap(scoped_ptr<T, D>& p1, scoped_ptr<T, D>& p2) {
+void swap(webrtc::scoped_ptr<T, D>& p1, webrtc::scoped_ptr<T, D>& p2) {
   p1.swap(p2);
 }
 
 template <class T, class D>
-bool operator==(T* p1, const scoped_ptr<T, D>& p2) {
+bool operator==(T* p1, const webrtc::scoped_ptr<T, D>& p2) {
   return p1 == p2.get();
 }
 
 template <class T, class D>
-bool operator!=(T* p1, const scoped_ptr<T, D>& p2) {
+bool operator!=(T* p1, const webrtc::scoped_ptr<T, D>& p2) {
   return p1 != p2.get();
 }
 
@@ -586,10 +588,8 @@ bool operator!=(T* p1, const scoped_ptr<T, D>& p2) {
 // Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
 // for scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
 template <typename T>
-scoped_ptr<T> make_scoped_ptr(T* ptr) {
-  return scoped_ptr<T>(ptr);
+webrtc::scoped_ptr<T> rtc_make_scoped_ptr(T* ptr) {
+  return webrtc::scoped_ptr<T>(ptr);
 }
 
-}  // namespace webrtc
-
 #endif  // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_SCOPED_PTR_H_