summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgiuca <mgiuca@chromium.org>2015-11-11 19:21:55 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-12 03:22:35 +0000
commite4c2c5e923fdcfb01c7f41f66347b6d2882df70a (patch)
tree592650d181eae8f4ba6218bf9e8d3d1ed28f5eed
parent5ab44a20e9a06112e3e3d350b9fcc928acdbc03b (diff)
downloadchromium_src-e4c2c5e923fdcfb01c7f41f66347b6d2882df70a.zip
chromium_src-e4c2c5e923fdcfb01c7f41f66347b6d2882df70a.tar.gz
chromium_src-e4c2c5e923fdcfb01c7f41f66347b6d2882df70a.tar.bz2
ScopedVector and ScopedPtrMap: Added deprecation notice.
Now we can just use std::vector and std::map, respectively. BUG=554289,554291 Review URL: https://codereview.chromium.org/1436913005 Cr-Commit-Position: refs/heads/master@{#359234}
-rw-r--r--base/containers/scoped_ptr_map.h3
-rw-r--r--base/memory/scoped_vector.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/base/containers/scoped_ptr_map.h b/base/containers/scoped_ptr_map.h
index 23aadbb..dfa26f4 100644
--- a/base/containers/scoped_ptr_map.h
+++ b/base/containers/scoped_ptr_map.h
@@ -22,6 +22,9 @@ namespace base {
//
// |ScopedPtr| must be a type scoped_ptr<T>. This is for compatibility with
// std::map in C++11.
+//
+// TODO(http://crbug.com/554291): DEPRECATED: Use std::map instead (now that we
+// have support for moveable types inside containers).
template <class Key, class ScopedPtr, class Compare = std::less<Key>>
class ScopedPtrMap {
MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(ScopedPtrMap)
diff --git a/base/memory/scoped_vector.h b/base/memory/scoped_vector.h
index e1e5c72..250947f 100644
--- a/base/memory/scoped_vector.h
+++ b/base/memory/scoped_vector.h
@@ -15,6 +15,9 @@
// ScopedVector wraps a vector deleting the elements from its
// destructor.
+//
+// TODO(http://crbug.com/554289): DEPRECATED: Use std::vector instead (now that
+// we have support for moveable types inside containers).
template <class T>
class ScopedVector {
MOVE_ONLY_TYPE_FOR_CPP_03(ScopedVector, RValue)