From 2edf9869450cdd9337eab5bc92623a0f074cc7ed Mon Sep 17 00:00:00 2001 From: dcheng Date: Fri, 25 Mar 2016 17:05:39 -0700 Subject: 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} --- third_party/WebKit/Source/wtf/Vector.h | 1 - 1 file changed, 1 deletion(-) 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; -- cgit v1.1