From e57501509f18017a2382fcfd570f55b43bda6c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20=E2=80=98Touky=E2=80=99=20Huet?= Date: Wed, 17 Sep 2014 03:45:47 +0000 Subject: [PATCH] build FIX ? --- build/Lol (vs2013).sln | 3 --- src/lol/base/array.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build/Lol (vs2013).sln b/build/Lol (vs2013).sln index d2a1f2f1..148b1ddd 100644 --- a/build/Lol (vs2013).sln +++ b/build/Lol (vs2013).sln @@ -420,7 +420,6 @@ Global {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|PS3.ActiveCfg = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Win32.Build.0 = Debug|Win32 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.ActiveCfg = Debug|x64 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.Build.0 = Debug|x64 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Win32 @@ -499,7 +498,6 @@ Global {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|ORBIS.ActiveCfg = Debug|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.ActiveCfg = Debug|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.ActiveCfg = Debug|Win32 - {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.Build.0 = Debug|Win32 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.ActiveCfg = Debug|x64 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.Build.0 = Debug|x64 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.ActiveCfg = Debug|Win32 @@ -579,7 +577,6 @@ Global {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|PS3.ActiveCfg = Debug|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|Win32.Build.0 = Debug|Win32 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64 {6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|Xbox 360.ActiveCfg = Debug|Win32 diff --git a/src/lol/base/array.h b/src/lol/base/array.h index 1cc70ffd..31e6ce38 100644 --- a/src/lol/base/array.h +++ b/src/lol/base/array.h @@ -483,8 +483,8 @@ public: } inline void Insert(ptrdiff_t pos, T... args) { - ASSERT(pos >= 0); - ASSERT(pos <= this->m_count); + //ASSERT(pos >= 0); + //ASSERT(pos <= this->m_count); if (this->m_count >= this->m_reserved) this->Grow();