summaryrefslogtreecommitdiff
path: root/src/utils
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/utils
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadManaVerse-311c175f3184103950c72bc5c775174597430b83.tar.gz
ManaVerse-311c175f3184103950c72bc5c775174597430b83.tar.bz2
ManaVerse-311c175f3184103950c72bc5c775174597430b83.tar.xz
ManaVerse-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/utils')
-rw-r--r--src/utils/browserboxtools.cpp2
-rw-r--r--src/utils/langs.h2
-rw-r--r--src/utils/stringutils.cpp2
-rw-r--r--src/utils/stringutils.h2
-rw-r--r--src/utils/stringvector.h2
-rw-r--r--src/utils/xmlutils.cpp2
-rw-r--r--src/utils/xmlutils.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/utils/browserboxtools.cpp b/src/utils/browserboxtools.cpp
index a8c2b6b3f..10113e220 100644
--- a/src/utils/browserboxtools.cpp
+++ b/src/utils/browserboxtools.cpp
@@ -126,7 +126,7 @@ std::string BrowserBoxTools::replaceLinkCommands(const std::string &link)
const int id = atoi(link.substr(0, idx).c_str());
if (id != 0)
{
- std::vector<int> parts;
+ STD_VECTOR<int> parts;
splitToIntVector(parts,
link.substr(idx), ',');
while (parts.size() < maxCards)
diff --git a/src/utils/langs.h b/src/utils/langs.h
index 133883089..63a6f9674 100644
--- a/src/utils/langs.h
+++ b/src/utils/langs.h
@@ -27,7 +27,7 @@
#include "localconsts.h"
-typedef std::vector<std::string> LangVect;
+typedef STD_VECTOR<std::string> LangVect;
typedef LangVect::const_iterator LangIter;
LangVect getLang() A_WARN_UNUSED;
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 7f3ba988c..2d91509c8 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -513,7 +513,7 @@ void splitToStringSet(std::set<std::string> &tokens,
}
}
-void splitToIntVector(std::vector<int> &tokens,
+void splitToIntVector(STD_VECTOR<int> &tokens,
const std::string &text,
const char separator)
{
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 545734a56..1b93c41d7 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -201,7 +201,7 @@ void splitToStringVector(StringVect &tokens,
void splitToStringSet(std::set<std::string> &tokens,
const std::string &text, const char separator);
-void splitToIntVector(std::vector<int> &tokens,
+void splitToIntVector(STD_VECTOR<int> &tokens,
const std::string &text, const char separator);
std::string combineDye(std::string file, const std::string &dye) A_WARN_UNUSED;
diff --git a/src/utils/stringvector.h b/src/utils/stringvector.h
index 7649f3b35..18a53881c 100644
--- a/src/utils/stringvector.h
+++ b/src/utils/stringvector.h
@@ -25,7 +25,7 @@
#include <string>
-typedef std::vector<std::string> StringVect;
+typedef STD_VECTOR<std::string> StringVect;
typedef StringVect::iterator StringVectIter;
typedef StringVect::const_iterator StringVectCIter;
diff --git a/src/utils/xmlutils.cpp b/src/utils/xmlutils.cpp
index ccb3aa870..56510c316 100644
--- a/src/utils/xmlutils.cpp
+++ b/src/utils/xmlutils.cpp
@@ -31,7 +31,7 @@ void readXmlIntVector(const std::string &fileName,
const std::string &sectionName,
const std::string &itemName,
const std::string &attributeName,
- std::vector<int> &arr,
+ STD_VECTOR<int> &arr,
const SkipError skipError)
{
XML::Document doc(fileName, UseVirtFs_true, skipError);
diff --git a/src/utils/xmlutils.h b/src/utils/xmlutils.h
index 6b24dc471..daa0575a8 100644
--- a/src/utils/xmlutils.h
+++ b/src/utils/xmlutils.h
@@ -33,7 +33,7 @@ void readXmlIntVector(const std::string &fileName,
const std::string &sectionName,
const std::string &itemName,
const std::string &attributeName,
- std::vector<int> &arr,
+ STD_VECTOR<int> &arr,
const SkipError skipError);
void readXmlStringMap(const std::string &fileName,