Replace custom Array with std::vector - friendly version

[xonotic/netradiant.git] / libs / container / array.h

diff --git a/libs/container/array.h b/libs/container/array.h
index c359df15f2dea4392cf273ab1ea7dc32662e71b7..57d2f6b0b73b22a3dcf9e4bb7b24ca6e1513e5d2 100644 (file)
--- a/libs/container/array.h
+++ b/libs/container/array.h
@@ -22,6 +22,14 @@
 #if !defined( INCLUDED_CONTAINER_ARRAY_H )
 #define INCLUDED_CONTAINER_ARRAY_H
 
+#include <vector>
+/// \todo remove the custom allocator
+#include "memory/allocator.h"
+template<typename Element, typename Allocator = DefaultAllocator<Element> >
+using Array = std::vector<Element, Allocator>;
+/// \todo replace Array<char> with std::string
+
+#if 0
 #include <cstddef>
 #include <algorithm>
 
@@ -166,5 +174,6 @@ inline void swap( Array<Element, Allocator>& self, Array<Element, Allocator>& ot
        self.swap( other );
 }
 }
+#endif
 
 #endif