summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-08-24 03:01:49 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-08-24 03:01:49 +0000
commit9f98286cf29d226b05b10ef96f18d9938392fa67 (patch)
tree3a139c3a1a730a787435d5af3194bd3735d1e0f7
parent2ccdfbbf786df73b08939c3909e9c9f5301e7a5f (diff)
parenta48a86ba37a1310f742ac267ac21655643627b57 (diff)
Merge "Revert "Make dchecked_vector C++11 compatible.""
-rw-r--r--runtime/base/dchecked_vector.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/base/dchecked_vector.h b/runtime/base/dchecked_vector.h
index 51dfba87eb..77f0ea2b7c 100644
--- a/runtime/base/dchecked_vector.h
+++ b/runtime/base/dchecked_vector.h
@@ -59,10 +59,8 @@ class dchecked_vector : private std::vector<T, Alloc> {
: Base() { }
explicit dchecked_vector(const allocator_type& alloc)
: Base(alloc) { }
- // Note that we cannot forward to std::vector(size_type, const allocator_type&) because it is not
- // available in C++11, which is the latest GCC can support. http://b/25022512
explicit dchecked_vector(size_type n, const allocator_type& alloc = allocator_type())
- : Base(alloc) { resize(n); }
+ : Base(n, alloc) { }
dchecked_vector(size_type n,
const value_type& value,
const allocator_type& alloc = allocator_type())