Really only need one set of fifo_buffer.hh,cc files (not two!). Merge the best of...

base/fifo_buffer.cc:
base/fifo_buffer.hh:
    style

--HG--
extra : convert_revision : 829a36362dd8ba9ae92ca5e3f7381eb5b300c964

diff --git a/base/fifo_buffer.cc b/base/fifo_buffer.cc
index d0b59e832af6a802a8bb03f4e58a1f52f61a76de..c702d299981a158bbd0884a4faf58cef37e8faa0 100644 (file)
--- a/base/fifo_buffer.cc
+++ b/base/fifo_buffer.cc
@@ -30,7 +30,7 @@
 
 template<class T>
 void
-FifoBuffer<T>::dump(void)
+FifoBuffer<T>::dump()
 {
     if (buffer->count() > 0)
         for (iterator i=buffer->tail(); i.notnull(); i=i.prev())

diff --git a/base/fifo_buffer.hh b/base/fifo_buffer.hh
index 27b4973ac3f62748cc35b3e29170888ab1a0b8bc..75690d36c016572691f9fe00d14bd6e4329d4f32 100644 (file)
--- a/base/fifo_buffer.hh
+++ b/base/fifo_buffer.hh
@@ -37,7 +37,8 @@
 //  constructor and a dump() method
 //
 template<class T>
-class FifoBuffer {
+class FifoBuffer
+{
   public:
     typedef typename res_list<T>::iterator iterator;
 
@@ -59,23 +60,15 @@ class FifoBuffer {
         buffer->add_head(item);
     }
 
-    iterator head(void) { return buffer->head(); }
-    iterator tail(void) { return buffer->tail(); }
+    iterator head() { return buffer->head(); }
+    iterator tail() { return buffer->tail(); }
 
-    unsigned count(void) {return buffer->count();}
-    unsigned free_slots(void) {return buffer->num_free();}
+    unsigned count() {return buffer->count();}
+    unsigned free_slots() {return buffer->num_free();}
 
-    T * peek(void)
-    {
-        if (count() > 0) {
-            return tail().data_ptr();
-        }
-        else {
-            return 0;
-        }
-    }
+    T *peek() { return (count() > 0) ? tail().data_ptr() : 0; }
 
-    T remove(void)
+    T remove()
     {
         assert(buffer->count() > 0);
         T rval = *buffer->tail();
@@ -83,7 +76,7 @@ class FifoBuffer {
         return rval;
     }
 
-    void dump(void);
+    void dump();
 
     ~FifoBuffer() { delete buffer; }
 };