Minor crappy changes

include/anki/gl/ShaderProgram.h

@@ -7,7 +7,7 @@
 #include "anki/math/Forward.h"
 #include "anki/util/NonCopyable.h"
 #include "anki/gl/Ogl.h"
-#include <vector>
+#include "anki/util/Vector.h"
 #include <string>
 #include <memory>
 

include/anki/gl/Texture.h

@@ -5,7 +5,7 @@
 #include "anki/util/Singleton.h"
 #include "anki/gl/Ogl.h"
 #include <cstdlib>
-#include <vector>
+#include "anki/util/Vector.h"
 #include <limits>
 #include <thread>
 

include/anki/physics/PhysWorld.h

@@ -2,7 +2,7 @@
 #define ANKI_PHYSICS_PHYS_WORLD_H
 
 #include "anki/physics/Convertors.h"
-#include <vector>
+#include "anki/util/Vector.h"
 #include <boost/scoped_ptr.hpp>
 #include <bullet/btBulletCollisionCommon.h>
 #include <bullet/btBulletDynamicsCommon.h>

include/anki/resource/Image.h

@@ -2,7 +2,7 @@
 #define ANKI_RESOURCE_IMAGE_H
 
 #include "anki/util/Functions.h"
-#include <vector>
+#include "anki/util/Vector.h"
 #include <iosfwd>
 #include <cstdint>
 

include/anki/resource/MeshLoader.h

@@ -5,7 +5,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/array.hpp>
 #include <string>
-#include <vector>
+#include "anki/util/Vector.h"
 
 namespace anki {
 

include/anki/resource/ShaderProgramPrePreprocessor.h

@@ -4,7 +4,7 @@
 #include "anki/resource/ShaderProgramCommon.h"
 #include <limits>
 #include <boost/array.hpp>
-#include <vector>
+#include "anki/util/Vector.h"
 
 
 namespace anki {

include/anki/resource/SkelAnim.h

@@ -2,7 +2,7 @@
 #define ANKI_RESOURCE_SKEL_ANIM_H
 
 #include "anki/math/Math.h"
-#include <vector>
+#include "anki/util/Vector.h"
 
 
 namespace anki {

include/anki/resource/Skeleton.h

@@ -2,7 +2,7 @@
 #define ANKI_RESOURCE_SKELETON_H
 
 #include "anki/math/Math.h"
-#include <vector>
+#include "anki/util/Vector.h"
 #include <array>
 
 

include/anki/resource/Skin.h

@@ -3,6 +3,7 @@
 
 #include "anki/resource/Resource.h"
 #include "anki/resource/Model.h"
+#include "anki/util/Vector.h"
 
 namespace anki {
 

include/anki/scene/Renderable.h

@@ -2,7 +2,7 @@
 #define ANKI_SCENE_RENDERABLE_H
 
 #include "anki/scene/Property.h"
-#include <vector>
+#include "anki/util/Vector.h"
 
 namespace anki {
 

include/anki/scene/Scene.h

@@ -6,7 +6,7 @@
 #include "anki/math/Math.h"
 #include "anki/util/Singleton.h"
 #include "anki/scene/Sector.h"
-#include <vector>
+#include "anki/util/Vector.h"
 
 namespace anki {
 

include/anki/scene/SkinNode.h

@@ -7,7 +7,7 @@
 #include "anki/scene/Spatial.h"
 #include "anki/resource/Model.h"
 #include "anki/math/Math.h"
-#include <vector>
+#include "anki/util/Vector.h"
 #include <array>
 
 namespace anki {

include/anki/scene/VisibilityTester.h

@@ -1,7 +1,7 @@
 #ifndef ANKI_SCENE_VISIBILITY_TESTER_H
 #define ANKI_SCENE_VISIBILITY_TESTER_H
 
-#include <vector>
+#include "anki/util/Vector.h"
 #include <cstdint>
 
 namespace anki {

include/anki/ui/UiFtFontLoader.h

@@ -2,7 +2,7 @@
 #define ANKI_UI_UI_FT_FONT_LOADER_H
 
 #include "anki/math/Math.h"
-#include <vector>
+#include "anki/util/Vector.h"
 #include <boost/range/iterator_range.hpp>
 #include <ft2build.h>
 #include FT_FREETYPE_H

include/anki/util/Object.h

@@ -2,7 +2,7 @@
 #define ANKI_UTIL_OBJECT_H
 
 #include "anki/util/Assert.h"
-#include <vector>
+#include "anki/util/Vector.h"
 #include <boost/range/iterator_range.hpp>
 
 namespace anki {

include/anki/util/StringList.h

@@ -1,7 +1,7 @@
 #ifndef ANKI_UTIL_STRING_LIST_H
 #define ANKI_UTIL_STRING_LIST_H
 
-#include <vector>
+#include "anki/util/Vector.h"
 #include <string>
 
 namespace anki {

include/anki/util/Vector.h

@@ -10,10 +10,14 @@ namespace anki {
 /// @addtogroup util
 /// @{
 
+template<typename T>
+using Vector = std::vector<T>;
+
+#if 0
 /// This is a wrapper of Vector that adds new functionality and assertions
 /// in operator[]
 template<typename Type, typename Allocator = std::allocator<Type>>
-class Vector: public Vector<Type, Allocator>
+class Vector: public std::vector<Type, Allocator>
 {
 public:
 	typedef Vector<Type, Allocator> Base;
@@ -68,6 +72,7 @@ public:
 	}
 	/// @}
 };
+#endif
 /// @}
 
 } // end namespace anki