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/vertexes/openglgraphicsvertexes.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/render/vertexes/openglgraphicsvertexes.h') diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h index dd05c7e1c..023abf139 100644 --- a/src/render/vertexes/openglgraphicsvertexes.h +++ b/src/render/vertexes/openglgraphicsvertexes.h @@ -56,16 +56,16 @@ class OpenGLGraphicsVertexes final GLshort *switchShortVertArray() restrict2; - std::vector *getFloatTexPool() restrict2 A_WARN_UNUSED + STD_VECTOR *getFloatTexPool() restrict2 A_WARN_UNUSED { return &mFloatTexPool; } - std::vector *getIntVertPool() restrict2 A_WARN_UNUSED + STD_VECTOR *getIntVertPool() restrict2 A_WARN_UNUSED { return &mIntVertPool; } - std::vector *getShortVertPool() restrict2 A_WARN_UNUSED + STD_VECTOR *getShortVertPool() restrict2 A_WARN_UNUSED { return &mShortVertPool; } - std::vector *getIntTexPool() restrict2 A_WARN_UNUSED + STD_VECTOR *getIntTexPool() restrict2 A_WARN_UNUSED { return &mIntTexPool; } void switchVp(const int n) restrict2; @@ -82,7 +82,7 @@ class OpenGLGraphicsVertexes final void updateVp(const int n) restrict2; - std::vector *getVp() restrict2 A_WARN_UNUSED + STD_VECTOR *getVp() restrict2 A_WARN_UNUSED { return &mVp; } void init() restrict2; @@ -95,12 +95,12 @@ class OpenGLGraphicsVertexes final GLint *mIntTexArray; GLint *mIntVertArray; GLshort *mShortVertArray; - std::vector mVp; - std::vector mFloatTexPool; - std::vector mIntVertPool; - std::vector mShortVertPool; - std::vector mIntTexPool; - std::vector mVbo; + STD_VECTOR mVp; + STD_VECTOR mFloatTexPool; + STD_VECTOR mIntVertPool; + STD_VECTOR mShortVertPool; + STD_VECTOR mIntTexPool; + STD_VECTOR mVbo; }; extern unsigned int vertexBufSize; -- cgit v1.2.3-60-g2f50