diff options
Diffstat (limited to 'dep/include/g3dlite/G3D/Array.h')
-rw-r--r-- | dep/include/g3dlite/G3D/Array.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/dep/include/g3dlite/G3D/Array.h b/dep/include/g3dlite/G3D/Array.h index f58ee5eeedb..34401af40c4 100644 --- a/dep/include/g3dlite/G3D/Array.h +++ b/dep/include/g3dlite/G3D/Array.h @@ -33,7 +33,6 @@ # pragma warning( disable : 4786) #endif - namespace G3D { /** @@ -60,7 +59,6 @@ const int SORT_DECREASING = -1; If SSE is defined Arrays allocate the first element aligned to 16 bytes. - Array is highly optimized compared to std::vector. Array operations are less expensive than on std::vector and for large amounts of data, Array consumes only 1.5x the total size of the @@ -120,13 +118,11 @@ private: return (address >= data) && (address < data + num); } - /** Only compiled if you use the sort procedure. */ static bool __cdecl compareGT(const T& a, const T& b) { return a > b; } - /** Allocates a new array of size numAllocated (not a parameter to the method) and then copies at most oldNum elements from the old array to it. Destructors are @@ -163,7 +159,6 @@ private: ptr->~T(); }} - System::alignedFree(oldData); } @@ -255,7 +250,6 @@ public: numAllocated = 0; } - /** Removes all elements. Use resize(0, false) or fastClear if you want to remove all elements without deallocating the underlying array @@ -329,7 +323,6 @@ public: resize(n, false); } - /** Inserts at the specified index and shifts all other elements up by one. */ @@ -444,7 +437,6 @@ public: } } - inline void append(const T& v1, const T& v2) { if (inArray(&v1) || inArray(&v2)) { T t1 = v1; @@ -463,7 +455,6 @@ public: } } - inline void append(const T& v1, const T& v2, const T& v3) { if (inArray(&v1) || inArray(&v2) || inArray(&v3)) { T t1 = v1; @@ -485,7 +476,6 @@ public: } } - inline void append(const T& v1, const T& v2, const T& v3, const T& v4) { if (inArray(&v1) || inArray(&v2) || inArray(&v3) || inArray(&v4)) { T t1 = v1; @@ -614,7 +604,6 @@ public: resize(num - 1, shrinkUnderlyingArrayIfNecessary); } - /** "The member function swaps the controlled sequences between *this and str." Note that this is slower than the optimal std implementation. @@ -627,7 +616,6 @@ public: *this = temp; } - /** Performs bounds checks in debug mode */ @@ -832,7 +820,6 @@ public: std::sort(data, data + num, lessThan); } - /** Sorts the array in increasing order using the > or < operator. To invoke this method on Array<T>, T must override those operator. @@ -1118,7 +1105,6 @@ public: medianPartition(ltMedian, eqMedian, gtMedian, temp, DefaultComparator()); } - /** Redistributes the elements so that the new order is statistically independent of the original order. O(n) time.*/ void randomize() { @@ -1133,10 +1119,8 @@ public: } } - }; - /** Array::contains for C-arrays */ template<class T> bool contains(const T* array, int len, const T& e) { for (int i = len - 1; i >= 0; --i) { |