Merge zizzer:/bk/multiarch

[gem5.git] / base / fifo_buffer.cc

diff --git a/base/fifo_buffer.cc b/base/fifo_buffer.cc
index d0b59e832af6a802a8bb03f4e58a1f52f61a76de..85b306c256c772b26e2fb1b99261bb98992d666a 100644 (file)
--- a/base/fifo_buffer.cc
+++ b/base/fifo_buffer.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,11 +26,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "fifo_buffer.hh"
+#include "base/fifo_buffer.hh"
 
 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())