diff options
| -rw-r--r-- | src/event/BufferedSocket.hxx | 4 | ||||
| -rw-r--r-- | src/input/TextInputStream.hxx | 4 | ||||
| -rw-r--r-- | src/util/StaticFifoBuffer.hxx (renamed from src/util/FifoBuffer.hxx) | 10 | ||||
| -rw-r--r-- | test/run_convert.cxx | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/event/BufferedSocket.hxx b/src/event/BufferedSocket.hxx index 1c9b44e46..b1882de2f 100644 --- a/src/event/BufferedSocket.hxx +++ b/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) diff --git a/src/input/TextInputStream.hxx b/src/input/TextInputStream.hxx index c67423da1..873ecdbda 100644 --- a/src/input/TextInputStream.hxx +++ b/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: /** diff --git a/src/util/FifoBuffer.hxx b/src/util/StaticFifoBuffer.hxx index 75d2d2ef2..81d03e43f 100644 --- a/src/util/FifoBuffer.hxx +++ b/src/util/StaticFifoBuffer.hxx @@ -1,5 +1,5 @@ /* - * 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() { diff --git a/test/run_convert.cxx b/test/run_convert.cxx index 3c75b2c19..47d9eae86 100644 --- a/test/run_convert.cxx +++ b/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) { { |