]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common: Update Throttle.h to work without using namespace
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 01:40:01 +0000 (21:40 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 14:30:38 +0000 (10:30 -0400)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/common/Throttle.h

index 1a6acac59d3cc48c417cd7c4dd7b9727a467cc1a..a249532b58f48880b98d062616320154ddf0d694 100644 (file)
@@ -163,12 +163,12 @@ class BackoffThrottle {
   unsigned next_cond = 0;
 
   /// allocated once to avoid constantly allocating new ones
-  vector<std::condition_variable> conds;
+  std::vector<std::condition_variable> conds;
 
   const bool use_perf;
 
   /// pointers into conds
-  list<std::condition_variable*> waiters;
+  std::list<std::condition_variable*> waiters;
 
   std::list<std::condition_variable*>::iterator _push_waiter() {
     unsigned next = next_cond++;
@@ -215,7 +215,7 @@ public:
     double high_multiple,
     double max_multiple,
     uint64_t throttle_max,
-    ostream *errstream);
+    std::ostream *errstream);
 
   ceph::timespan get(uint64_t c = 1);
   ceph::timespan wait() {
@@ -364,7 +364,7 @@ class TokenBucketThrottle {
   SafeTimer *m_timer;
   Mutex *m_timer_lock;
   FunctionContext *m_token_ctx = nullptr;
-  list<Blocker> m_blockers;
+  std::list<Blocker> m_blockers;
   Mutex m_lock;
 
   // minimum of the filling period.