From 311c175f3184103950c72bc5c775174597430b83 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Jul 2017 01:31:22 +0300 Subject: Replace std::vector into macro STD_VECTOR. In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features. --- src/render/mobileopengl2graphics.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/render/mobileopengl2graphics.cpp') diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index 1b532e48d..919eb67fe 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -604,11 +604,11 @@ inline void MobileOpenGL2Graphics::drawVertexes(const OpenGLGraphicsVertexes & restrict ogl) restrict2 { - const std::vector &vp = ogl.mVp; - const std::vector &vbos = ogl.mVbo; - std::vector::const_iterator ivp; - std::vector::const_iterator ivbo; - const std::vector::const_iterator ivp_end = vp.end(); + const STD_VECTOR &vp = ogl.mVp; + const STD_VECTOR &vbos = ogl.mVbo; + STD_VECTOR::const_iterator ivp; + STD_VECTOR::const_iterator ivbo; + const STD_VECTOR::const_iterator ivp_end = vp.end(); for (ivp = vp.begin(), ivbo = vbos.begin(); ivp != ivp_end; @@ -1283,14 +1283,14 @@ void MobileOpenGL2Graphics::finalize(ImageVertexes *restrict const vert) if (vert == nullptr) return; OpenGLGraphicsVertexes &ogl = vert->ogl; - const std::vector &vp = ogl.mVp; - std::vector::const_iterator ivp; - const std::vector::const_iterator ivp_end = vp.end(); - std::vector &floatTexPool = ogl.mFloatTexPool; - std::vector::const_iterator ft; - const std::vector::const_iterator ft_end = floatTexPool.end(); - std::vector &vbos = ogl.mVbo; - std::vector::const_iterator ivbo; + const STD_VECTOR &vp = ogl.mVp; + STD_VECTOR::const_iterator ivp; + const STD_VECTOR::const_iterator ivp_end = vp.end(); + STD_VECTOR &floatTexPool = ogl.mFloatTexPool; + STD_VECTOR::const_iterator ft; + const STD_VECTOR::const_iterator ft_end = floatTexPool.end(); + STD_VECTOR &vbos = ogl.mVbo; + STD_VECTOR::const_iterator ivbo; const int sz = CAST_S32(floatTexPool.size()); vbos.resize(sz); @@ -1305,7 +1305,7 @@ void MobileOpenGL2Graphics::finalize(ImageVertexes *restrict const vert) *ft, GL_STATIC_DRAW); } - for (std::vector::iterator it = floatTexPool.begin(); + for (STD_VECTOR::iterator it = floatTexPool.begin(); it != floatTexPool.end(); ++ it) { delete [] (*it); -- cgit v1.2.3-60-g2f50