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

Unified Diff: containers/scoped_ptr_map.h

Issue 2045223003: Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a. (Closed) Base URL: https://github.com/domokit/base.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « basictypes.h ('k') | containers/scoped_ptr_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: containers/scoped_ptr_map.h
diff --git a/containers/scoped_ptr_map.h b/containers/scoped_ptr_map.h
index a4605e3b68877a2d8585552573d1603c75bdd7f6..622a39d121e8fa2b3f5eb8f91874229d6bf885d3 100644
--- a/containers/scoped_ptr_map.h
+++ b/containers/scoped_ptr_map.h
@@ -42,9 +42,9 @@ class ScopedPtrMap {
ScopedPtrMap() {}
~ScopedPtrMap() { clear(); }
- ScopedPtrMap(ScopedPtrMap<Key, ScopedPtr>&& other) { swap(other); }
+ ScopedPtrMap(ScopedPtrMap&& other) { swap(other); }
- ScopedPtrMap& operator=(ScopedPtrMap<Key, ScopedPtr>&& rhs) {
+ ScopedPtrMap& operator=(ScopedPtrMap&& rhs) {
swap(rhs);
return *this;
}
@@ -61,7 +61,7 @@ class ScopedPtrMap {
const_iterator begin() const { return data_.begin(); }
const_iterator end() const { return data_.end(); }
- void swap(ScopedPtrMap<Key, ScopedPtr>& other) { data_.swap(other.data_); }
+ void swap(ScopedPtrMap& other) { data_.swap(other.data_); }
void clear() { STLDeleteValues(&data_); }
« no previous file with comments | « basictypes.h ('k') | containers/scoped_ptr_map_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698