util/FifoBuffer: rename to StaticFifoBuffer

src/event/BufferedSocket.hxx

@@ -22,7 +22,7 @@
 
 #include "check.h"
 #include "SocketMonitor.hxx"
-#include "util/FifoBuffer.hxx"
+#include "util/StaticFifoBuffer.hxx"
 
 #include <assert.h>
 #include <stdint.h>
@@ -34,7 +34,7 @@ class EventLoop;
  * A #SocketMonitor specialization that adds an input buffer.
  */
 class BufferedSocket : protected SocketMonitor {
-	FifoBuffer<uint8_t, 8192> input;
+	StaticFifoBuffer<uint8_t, 8192> input;
 
 public:
 	BufferedSocket(int _fd, EventLoop &_loop)

src/input/TextInputStream.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_TEXT_INPUT_STREAM_HXX
 #define MPD_TEXT_INPUT_STREAM_HXX
 
-#include "util/FifoBuffer.hxx"
+#include "util/StaticFifoBuffer.hxx"
 
 #include <string>
 
@@ -28,7 +28,7 @@ class InputStream;
 
 class TextInputStream {
 	InputStream &is;
-	FifoBuffer<char, 4096> buffer;
+	StaticFifoBuffer<char, 4096> buffer;
 
 public:
 	/**

src/util/FifoBuffer.hxx → src/util/StaticFifoBuffer.hxx

 /*
- * Copyright (C) 2003-2010 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2003-2014 Max Kellermann <max@duempel.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,8 +27,8 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef FIFO_BUFFER_HPP
-#define FIFO_BUFFER_HPP
+#ifndef STATIC_FIFO_BUFFER_HPP
+#define STATIC_FIFO_BUFFER_HPP
 
 #include "WritableBuffer.hxx"
 
@@ -44,7 +44,7 @@
  * buffer as needed.  It is not thread safe.
  */
 template<class T, size_t size>
-class FifoBuffer {
+class StaticFifoBuffer {
 public:
   typedef size_t size_type;
 
@@ -57,7 +57,7 @@ protected:
 
 public:
   constexpr
-  FifoBuffer():head(0), tail(0) {}
+  StaticFifoBuffer():head(0), tail(0) {}
 
 protected:
   void Shift() {

test/run_convert.cxx

@@ -28,7 +28,7 @@
 #include "AudioFormat.hxx"
 #include "pcm/PcmConvert.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "util/FifoBuffer.hxx"
+#include "util/StaticFifoBuffer.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 #include "stdbin.h"
@@ -81,7 +81,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	FifoBuffer<uint8_t, 4096> buffer;
+	StaticFifoBuffer<uint8_t, 4096> buffer;
 
 	while (true) {
 		{