(svn r13575) -Codechange: Move small vector to core since it fits better in there

-Codechange: convert smallvector from struct to class
This commit is contained in:
skidd13
2008-06-19 10:19:02 +00:00
parent c4cc5cdf3b
commit 2f65d35ead
8 changed files with 22 additions and 20 deletions

View File

@@ -1,12 +1,12 @@
/* $Id$ */
/** @file smallvec.h Simple vector class that allows allocating an item without the need to copy this->data needlessly. */
/** @file smallvec_type.hpp Simple vector class that allows allocating an item without the need to copy this->data needlessly. */
#ifndef SMALLVEC_H
#define SMALLVEC_H
#ifndef SMALLVEC_TYPE_HPP
#define SMALLVEC_TYPE_HPP
#include "../core/alloc_func.hpp"
#include "../core/math_func.hpp"
#include "alloc_func.hpp"
#include "math_func.hpp"
/**
* Simple vector template class.
@@ -19,11 +19,13 @@
* @param S The steps of allocation
*/
template <typename T, uint S>
struct SmallVector {
class SmallVector {
protected:
T *data; ///< The pointer to the first item
uint items; ///< The number of items stored
uint capacity; ///< The avalible space for storing items
public:
SmallVector() : data(NULL), items(0), capacity(0) { }
~SmallVector()
@@ -160,4 +162,4 @@ struct SmallVector {
}
};
#endif /* SMALLVEC_H */
#endif /* SMALLVEC_TYPE_HPP */

View File

@@ -6,7 +6,7 @@
#define FIOS_H
#include "strings_type.h"
#include "misc/smallvec.h"
#include "core/smallvec_type.hpp"
enum {
/**

View File

@@ -9,7 +9,7 @@
#include "core/bitmath_func.hpp"
#include "core/mem_func.hpp"
#include "core/sort_func.hpp"
#include "misc/smallvec.h"
#include "core/smallvec_type.hpp"
#include "date_type.h"
enum SortListFlags {

View File

@@ -5,7 +5,7 @@
#ifndef VEHICLELIST_H
#define VEHICLELIST_H
#include "misc/smallvec.h"
#include "core/smallvec_type.hpp"
typedef SmallVector<const Vehicle *, 32> VehicleList;

View File

@@ -44,7 +44,7 @@
#include "settings_type.h"
#include "station_func.h"
#include "core/alloc_type.hpp"
#include "misc/smallvec.h"
#include "core/smallvec_type.hpp"
#include "window_func.h"
#include "tilehighlight_func.h"
#include "window_gui.h"