New xr_array class instead of deprecated svector

Reverted changes for FixedVector.h from previous commit

Author: Xottab-DUTY

src/Common/Common.vcxproj

@@ -171,6 +171,7 @@
     <ClInclude Include="..\xrCommon\math_funcs_inline.h" />
     <ClInclude Include="..\xrCommon\misc_math_types.h" />
     <ClInclude Include="..\xrCommon\predicates.h" />
+    <ClInclude Include="..\xrCommon\xr_array.h" />
     <ClInclude Include="..\xrCommon\xr_deque.h" />
     <ClInclude Include="..\xrCommon\xr_list.h" />
     <ClInclude Include="..\xrCommon\xr_map.h" />

src/Common/Common.vcxproj.filters

@@ -82,6 +82,9 @@
     <ClInclude Include="..\xrCommon\xr_unordered_map.h">
       <Filter>xrCommon</Filter>
     </ClInclude>
+    <ClInclude Include="..\xrCommon\xr_array.h">
+      <Filter>xrCommon</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="NvMender2003">

src/editors/LevelEditor/Edit/ESceneDOTools.h

@@ -24,7 +24,8 @@ struct SIndexDist
     SIndexDist() { ZeroMemory(this, sizeof(SIndexDist)); }
 };
 
-DEFINE_SVECTOR(SIndexDist, 4, SIndexDistVec, SIndexDistIt);
+typedef svector<SIndexDist, 4> SIndexDistVec;
+typedef SIndexDistVec::iterator SIndexDistIt;
 
 DEFINE_MAP(u32, DOVec, ColorIndexMap, ColorIndexPairIt);
 

src/xrCommon/xr_array.h

@@ -0,0 +1,14 @@
+#pragma once
+#include <array>
+
+template<typename T, size_t Size>
+using xr_array = std::array<T, Size>;
+
+// compatibility with old svector
+template<typename T, size_t Size>
+class xr_array_s : public std::array<T, Size>
+{
+    // svector used to contain the 'count' variable
+    // which used 4 bytes of memory
+    u32 dummy = 0;
+};

src/xrCore/FixedVector.h

@@ -2,6 +2,7 @@
 #ifndef FixedVectorH
 #define FixedVectorH
 
+// deprecated, use xr_array instead
 template <class T, std::size_t dim>
 class svector
 {
@@ -15,7 +16,7 @@ class svector
 
 private:
     value_type array[dim];
-    size_t count;
+    u32 count;
 
 public:
     svector() : count(0) {}
@@ -26,7 +27,7 @@ class svector
     IC const_iterator end() const { return array + count; }
     IC const_iterator cbegin() const { return array; }
     IC const_iterator cend() const { return array + count; }
-    IC size_t size() const { return count; }
+    IC u32 size() const { return count; }
     IC void clear() { count = 0; }
 
     IC void resize(int c)
@@ -49,13 +50,13 @@ class svector
         count--;
     }
 
-    IC reference operator[](size_t id)
+    IC reference operator[](u32 id)
     {
         VERIFY(id < count);
         return array[id];
     }
 
-    IC const_reference operator[](size_t id) const
+    IC const_reference operator[](u32 id) const
     {
         VERIFY(id < count);
         return array[id];
@@ -80,16 +81,16 @@ class svector
 
     IC void inc() { count++; }
     IC bool empty() const { return 0 == count; }
-    IC void erase(size_t id)
+    IC void erase(u32 id)
     {
         VERIFY(id < count);
         count--;
-        for (size_t i = id; i < count; i++)
+        for (u32 i = id; i < count; i++)
             array[i] = array[i + 1];
     }
 
-    IC void erase(iterator it) { erase(it - begin()); }
-    IC void insert(size_t id, reference V)
+    IC void erase(iterator it) { erase(u32(it - begin())); }
+    IC void insert(u32 id, reference V)
     {
         VERIFY(id < count);
         for (int i = count; i > int(id); i--)
@@ -107,11 +108,10 @@ class svector
     {
         if (size() != base.size())
             return false;
-        for (size_t cmp = 0; cmp < size(); cmp++)
+        for (u32 cmp = 0; cmp < size(); cmp++)
             if ((*this)[cmp] != base[cmp])
                 return false;
         return true;
     }
 };
-
 #endif

src/xrCore/_stl_extensions.h

@@ -9,6 +9,7 @@
 #include "_std_extensions.h"
 #include "xrMemory.h"
 #include "xrCore/Memory/XRayAllocator.hpp"
+#include "xrCommon/xr_array.h"
 #include "xrCommon/xr_vector.h"
 #include "xrCommon/xr_map.h"
 #include "xrCommon/xr_set.h"
@@ -29,9 +30,6 @@
 // Xottab_DUTY: TODO: or maybe use Im-Dex variant (Get rid of this DEFINE macroses)
 
 // STL extensions
-#define DEFINE_SVECTOR(T, C, N, I) \
-    typedef svector<T, C> N;       \
-    typedef N::iterator I;
 #include "FixedVector.h"
 #include "buffer_vector.h"
 #include "xr_vector_defs.h"