Merge pull request #3933 from delroth/fixed-size-queue

FixedSizeQueue: modernize (std::array, std::move)
This commit is contained in:
Matthew Parlane 2016-06-26 10:31:07 +12:00 committed by GitHub
commit 5ba3e641ea

View File

@ -4,33 +4,19 @@
#pragma once
#include <array>
#include <cstddef>
#include <utility>
// STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
// real STL classes.
//
// Not fully featured, no safety checking yet. Add features as needed.
// TODO: "inline" storage?
template <class T, int N>
class FixedSizeQueue
{
T* storage;
int head;
int tail;
int count; // sacrifice 4 bytes for a simpler implementation. may optimize away in the future.
// Make copy constructor private for now.
FixedSizeQueue(FixedSizeQueue& other) {}
public:
FixedSizeQueue()
{
storage = new T[N];
clear();
}
~FixedSizeQueue() { delete[] storage; }
void clear()
{
head = 0;
@ -40,7 +26,7 @@ public:
void push(T t)
{
storage[tail] = t;
storage[tail] = std::move(t);
tail++;
if (tail == N)
tail = 0;
@ -57,12 +43,18 @@ public:
T pop_front()
{
const T& temp = storage[head];
T& temp = storage[head];
pop();
return temp;
return std::move(temp);
}
T& front() { return storage[head]; }
const T& front() const { return storage[head]; }
size_t size() const { return count; }
private:
std::array<T, N> storage;
int head = 0;
int tail = 0;
// Sacrifice 4 bytes for a simpler implementation. may optimize away in the future.
int count = 0;
};