generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scoped_ptr.h: Renames function and change namespace scope to fix conflicts with Chromium not detected by the FYI bots.

Browse Source 
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
This commit is contained in:
henrike@webrtc.org 2014-10-28 18:06:42 +00:00
parent ae694effd8
commit bd6bdca57f
1 changed files with 7 additions and 7 deletions

14
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; template <class U> bool operator!=(scoped_ptr<U> const& p2) const;
}; };
} // namespace webrtc
template <class T, class D> 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); p1.swap(p2);
} }
template <class T, class D> 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(); return p1 == p2.get();
} }
template <class T, class D> 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(); 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 // Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
// for scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg)) // for scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
template <typename T> template <typename T>
scoped_ptr<T> make_scoped_ptr(T* ptr) { webrtc::scoped_ptr<T> rtc_make_scoped_ptr(T* ptr) {
return scoped_ptr<T>(ptr); return webrtc::scoped_ptr<T>(ptr);
} }
} // namespace webrtc
#endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_SCOPED_PTR_H_ #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_SCOPED_PTR_H_