From 4de78cbfccb7d0a42ff52d3476180c7acd292f2a Mon Sep 17 00:00:00 2001 From: Nicholas Ormrod Date: Mon, 3 Nov 2014 10:06:41 -0800 Subject: [PATCH] rm protected inheritance Summary: Remove the protected inheritance from folly. The code looks like the protected might be appropriate: there are some derived classes which might want access to the AsyncTimeout. Test Plan: run unit tests Reviewed By: davejwatson@fb.com Subscribers: trunkagent, sdwilsh, njormrod, folly-diffs@ FB internal diff: D1649686 Tasks: 5486739 Signature: t1:1649686:1415035288:18efd2cf9aae8caab66d8303c22cdc26c6b54ae5 --- folly/io/async/HHWheelTimer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folly/io/async/HHWheelTimer.h b/folly/io/async/HHWheelTimer.h index b55d8857..66ad4232 100644 --- a/folly/io/async/HHWheelTimer.h +++ b/folly/io/async/HHWheelTimer.h @@ -54,7 +54,7 @@ namespace folly { * maintaining time and timers, provided that we can maintain * a consistent rate of ticks. */ -class HHWheelTimer : protected folly::AsyncTimeout, +class HHWheelTimer : private folly::AsyncTimeout, public folly::DelayedDestruction { public: typedef std::unique_ptr UniquePtr; -- 2.34.1