From 84ece021fde4850b4755b81bb6886ffced6b7020 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 16 Jan 2010 14:17:03 +0000 Subject: [PATCH] (svn r18825) -Codechange: Sometimes code is shorter if you do not use a function for deduplication. (skidd13) --- src/misc/fixedsizearray.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/misc/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp index fc57c79344..435dfad79d 100644 --- a/src/misc/fixedsizearray.hpp +++ b/src/misc/fixedsizearray.hpp @@ -92,16 +92,14 @@ public: FORCEINLINE bool IsFull() const { return Length() >= C; }; /** return true if array is empty */ FORCEINLINE bool IsEmpty() const { return Length() <= 0; }; - /** index validation */ - FORCEINLINE void CheckIdx(uint index) const { assert(index < Length()); } /** add (allocate), but don't construct item */ FORCEINLINE T& Append() { assert(!IsFull()); return data[SizeRef()++]; } /** add and construct item using default constructor */ FORCEINLINE T& AppendC() { T& item = Append(); new(&item)T; return item; } /** return item by index (non-const version) */ - FORCEINLINE T& operator [] (uint index) { CheckIdx(index); return data[index]; } + FORCEINLINE T& operator [] (uint index) { assert(index < Length()); return data[index]; } /** return item by index (const version) */ - FORCEINLINE const T& operator [] (uint index) const { CheckIdx(index); return data[index]; } + FORCEINLINE const T& operator [] (uint index) const { assert(index < Length()); return data[index]; } }; #endif /* FIXEDSIZEARRAY_HPP */