oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/{Foreign,Static}FifoBuffer: use C++11 initializers

Browse Source
This commit is contained in:
Max Kellermann 2017-04-24 20:16:18 +02:00
parent 043cbec68f
commit ed3220f37f
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/ForeignFifoBuffer.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2014 Max Kellermann <max.kellermann@gmail.com> * Copyright (C) 2003-2017 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -57,15 +57,15 @@ public:
typedef typename Range::const_pointer_type const_pointer_type; typedef typename Range::const_pointer_type const_pointer_type;
protected: protected:
size_type head, tail, capacity; size_type head = 0, tail = 0, capacity;
T *data; T *data;
public: public:
explicit constexpr ForeignFifoBuffer(std::nullptr_t n) explicit constexpr ForeignFifoBuffer(std::nullptr_t n)
:head(0), tail(0), capacity(0), data(n) {} :capacity(0), data(n) {}
constexpr ForeignFifoBuffer(T *_data, size_type _capacity) constexpr ForeignFifoBuffer(T *_data, size_type _capacity)
:head(0), tail(0), capacity(_capacity), data(_data) {} :capacity(_capacity), data(_data) {}
ForeignFifoBuffer(ForeignFifoBuffer &&src) ForeignFifoBuffer(ForeignFifoBuffer &&src)
:head(src.head), tail(src.tail), :head(src.head), tail(src.tail),

7
src/util/StaticFifoBuffer.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2014 Max Kellermann <max.kellermann@gmail.com> * Copyright (C) 2003-2017 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -52,13 +52,10 @@ public:
typedef WritableBuffer<T> Range; typedef WritableBuffer<T> Range;
protected: protected:
size_type head, tail; size_type head = 0, tail = 0;
T data[size]; T data[size];
public: public:
constexpr
StaticFifoBuffer():head(0), tail(0) {}
void Shift() { void Shift() {
if (head == 0) if (head == 0)
return; return;