Bug ceph#98: Movement of an underscore for a data structure identifier

A leading underscore was moved to the back of a data structure identifier. Signed-off-by: Markus Elfring <[email protected]> Signed-off-by: Sage Weil <[email protected]>
allenk · Jun 17, 2010 · 9013832 · 9013832
1 parent f650156
commit 9013832
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/common/WorkQueue.cc b/src/common/WorkQueue.cc
@@ -28,7 +28,7 @@ void ThreadPool::worker()
   dout(10) << "worker start" << dendl;
   while (!_stop) {
     if (!_pause && work_queues.size()) {
-      _WorkQueue *wq;
+      WorkQueue_* wq;
       int tries = work_queues.size();
       bool did = false;
       while (tries--) {
@@ -121,7 +121,7 @@ void ThreadPool::unpause()
   _lock.Unlock();
 }
 
-void ThreadPool::drain(_WorkQueue *wq)
+void ThreadPool::drain(WorkQueue_* wq)
 {
   dout(10) << "drain" << dendl;
   _lock.Lock();

diff --git a/src/common/WorkQueue.h b/src/common/WorkQueue.h
@@ -27,10 +27,10 @@ class ThreadPool {
   int _draining;
   Cond _wait_cond;
 
-  struct _WorkQueue {
+  struct WorkQueue_ {
     string name;
-    _WorkQueue(string n) : name(n) {}
-    virtual ~_WorkQueue() {}
+    WorkQueue_(string n) : name(n) {}
+    virtual ~WorkQueue_() {}
     virtual void _clear() = 0;
     virtual bool _empty() = 0;
     virtual void *_void_dequeue() = 0;
@@ -40,7 +40,7 @@ class ThreadPool {
 
 public:
   template<class T>
-  class WorkQueue : public _WorkQueue {
+  class WorkQueue : public WorkQueue_ {
     ThreadPool *pool;
 
     virtual bool _enqueue(T *) = 0;
@@ -60,7 +60,7 @@ class ThreadPool {
     }
 
   public:
-    WorkQueue(string n, ThreadPool *p) : _WorkQueue(n), pool(p) {
+    WorkQueue(string n, ThreadPool* p) : WorkQueue_(n), pool(p) {
       pool->add_work_queue(this);
     }
     ~WorkQueue() {
@@ -101,7 +101,7 @@ class ThreadPool {
   };
 
 private:
-  vector<_WorkQueue*> work_queues;
+  vector<WorkQueue_*> work_queues;
   int last_work_queue;
 
 
@@ -138,10 +138,10 @@ class ThreadPool {
       delete *p;
   }
 
-  void add_work_queue(_WorkQueue *wq) {
+  void add_work_queue(WorkQueue_* wq) {
     work_queues.push_back(wq);
   }
-  void remove_work_queue(_WorkQueue *wq) {
+  void remove_work_queue(WorkQueue_* wq) {
     unsigned i = 0;
     while (work_queues[i] != wq)
       i++;
@@ -182,7 +182,7 @@ class ThreadPool {
   void pause();
   void pause_new();
   void unpause();
-  void drain(_WorkQueue *wq = 0);
+  void drain(WorkQueue_* wq = 0);
 };