summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/actions
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmv-311c175f3184103950c72bc5c775174597430b83.tar.gz
mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2
mv-311c175f3184103950c72bc5c775174597430b83.tar.xz
mv-311c175f3184103950c72bc5c775174597430b83.zip
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.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/actions.cpp6
-rw-r--r--src/actions/commands.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 8f2c8facc..9fd53d926 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -1479,7 +1479,7 @@ impHandler0(testSdlFont)
timespec time1;
timespec time2;
NullOpenGLGraphics *nullGraphics = new NullOpenGLGraphics;
- std::vector<std::string> data;
+ STD_VECTOR<std::string> data;
volatile int width = 0;
for (int f = 0; f < 300; f ++)
@@ -1491,12 +1491,12 @@ impHandler0(testSdlFont)
for (int f = 0; f < 500; f ++)
{
- FOR_EACH (std::vector<std::string>::const_iterator, it, data)
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, data)
{
width += font->getWidth(*it);
font->drawString(nullGraphics, color, color, *it, 10, 10);
}
- FOR_EACH (std::vector<std::string>::const_iterator, it, data)
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, data)
font->drawString(nullGraphics, color, color, *it, 10, 10);
font->doClean();
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 0107770fe..6b51d2270 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -294,7 +294,7 @@ impHandler(chatAdd)
if (event.args.empty())
return true;
- std::vector<int> str;
+ STD_VECTOR<int> str;
splitToIntVector(str, event.args, ',');
if (str.empty())
return true;