From: Brian Watling Date: Wed, 27 Nov 2013 21:31:51 +0000 (-0800) Subject: Trivial argument rename in MPMCQueue X-Git-Tag: v0.22.0~783 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=048a4518ce3b44df833fa68518e84e7eef5ace04;p=folly.git Trivial argument rename in MPMCQueue Summary: Rename the 'capacity' argument so g++ will not complain when -Wshadow is enabled ('capacity' is also a method on MPMCQueue) Test Plan: compiles, unit tests pass Reviewed By: ngbronson@fb.com FB internal diff: D1076220 --- diff --git a/folly/MPMCQueue.h b/folly/MPMCQueue.h index fef1730e..defbdfe0 100644 --- a/folly/MPMCQueue.h +++ b/folly/MPMCQueue.h @@ -89,11 +89,11 @@ class MPMCQueue : boost::noncopyable { public: typedef T value_type; - explicit MPMCQueue(size_t capacity) - : capacity_(capacity) - , slots_(new detail::SingleElementQueue[capacity + + explicit MPMCQueue(size_t queueCapacity) + : capacity_(queueCapacity) + , slots_(new detail::SingleElementQueue[queueCapacity + 2 * kSlotPadding]) - , stride_(computeStride(capacity)) + , stride_(computeStride(queueCapacity)) , pushTicket_(0) , popTicket_(0) , pushSpinCutoff_(0)