summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2016-03-25 17:05:39 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-26 00:07:46 +0000
commit2edf9869450cdd9337eab5bc92623a0f074cc7ed (patch)
tree82226b13f3c2c1ea31fb838f5a9e324ac1397700
parentfe083b305a95370de0877e17aec60fabebacbb96 (diff)
downloadchromium_src-2edf9869450cdd9337eab5bc92623a0f074cc7ed.zip
chromium_src-2edf9869450cdd9337eab5bc92623a0f074cc7ed.tar.gz
chromium_src-2edf9869450cdd9337eab5bc92623a0f074cc7ed.tar.bz2
Remove unneeded using Base::capacity in WTF::Vector definition.
Redundant since Vector already defines capacity() as a public method, and it confuses the Chrome style rewriter. From C++11 [namespace.udecl/15]: When a using-declaration brings names from a base class into a derived class scope, member functions and member function templates in the derived class override and/or hide member functions and member function templates with the same name, parameter-type-list (8.3.5), cv-qualification, and ref-qualifier (if any) in a base class (rather than conflicting). BUG=584105 Review URL: https://codereview.chromium.org/1837583002 Cr-Commit-Position: refs/heads/master@{#383415}
-rw-r--r--third_party/WebKit/Source/wtf/Vector.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/third_party/WebKit/Source/wtf/Vector.h b/third_party/WebKit/Source/wtf/Vector.h
index c749a1a..0cd4794 100644
--- a/third_party/WebKit/Source/wtf/Vector.h
+++ b/third_party/WebKit/Source/wtf/Vector.h
@@ -836,7 +836,6 @@ private:
using Base::m_size;
using Base::buffer;
- using Base::capacity;
using Base::swapVectorBuffer;
using Base::allocateBuffer;
using Base::allocationSize;