summaryrefslogtreecommitdiff
path: root/src/resources/db/itemoptiondb.cpp
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/resources/db/itemoptiondb.cpp
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/resources/db/itemoptiondb.cpp')
-rw-r--r--src/resources/db/itemoptiondb.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/db/itemoptiondb.cpp b/src/resources/db/itemoptiondb.cpp
index bd78f95c5..2f7fc1ccd 100644
--- a/src/resources/db/itemoptiondb.cpp
+++ b/src/resources/db/itemoptiondb.cpp
@@ -33,7 +33,7 @@
namespace
{
ItemOptionDb::OptionInfos mOptions;
- const std::vector<ItemFieldType*> mEmptyOption;
+ const STD_VECTOR<ItemFieldType*> mEmptyOption;
bool mLoaded = false;
} // namespace
@@ -48,7 +48,7 @@ void ItemOptionDb::load()
mLoaded = true;
}
-static void addFieldByName(std::vector<ItemFieldType*> &options,
+static void addFieldByName(STD_VECTOR<ItemFieldType*> &options,
XmlNodeConstPtr node,
const ItemFieldDb::FieldInfos &fields,
const char *const name)
@@ -68,7 +68,7 @@ static void addFieldByName(std::vector<ItemFieldType*> &options,
}
}
-static void readOptionFields(std::vector<ItemFieldType*> &options,
+static void readOptionFields(STD_VECTOR<ItemFieldType*> &options,
XmlNodeConstPtr node,
const ItemFieldDb::FieldInfos &fields)
{
@@ -127,7 +127,7 @@ void ItemOptionDb::loadXmlFile(const std::string &fileName,
reportAlways("Empty id field in ItemOptionDb");
continue;
}
- std::vector<ItemFieldType*> &options = mOptions[id];
+ STD_VECTOR<ItemFieldType*> &options = mOptions[id];
readOptionFields(options, node, requiredFields);
readOptionFields(options, node, addFields);
}
@@ -140,7 +140,7 @@ void ItemOptionDb::unload()
mLoaded = false;
}
-const std::vector<ItemFieldType*> &ItemOptionDb::getFields(const int id)
+const STD_VECTOR<ItemFieldType*> &ItemOptionDb::getFields(const int id)
{
OptionInfos::const_iterator it = mOptions.find(id);
if (it == mOptions.end())