diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
| commit | 311c175f3184103950c72bc5c775174597430b83 (patch) | |
| tree | ad022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/unittests/utils | |
| parent | 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff) | |
| download | manaverse-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/unittests/utils')
| -rw-r--r-- | src/unittests/utils/stringutils_unittest.cc | 6 | ||||
| -rw-r--r-- | src/unittests/utils/xmlutils_unittest.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/unittests/utils/stringutils_unittest.cc b/src/unittests/utils/stringutils_unittest.cc index b137ef30d..ee0a00cb0 100644 --- a/src/unittests/utils/stringutils_unittest.cc +++ b/src/unittests/utils/stringutils_unittest.cc @@ -379,7 +379,7 @@ TEST_CASE("stringuntils findI 1", "") TEST_CASE("stringuntils findI 2", "") { - std::vector <std::string> vect1; + STD_VECTOR <std::string> vect1; vect1.push_back("test"); vect1.push_back("line"); vect1.push_back("qwe"); @@ -800,7 +800,7 @@ TEST_CASE("stringuntils splitToStringSet 1", "") TEST_CASE("stringuntils splitToIntVector 1", "") { - std::vector<int> tokens; + STD_VECTOR<int> tokens; splitToIntVector(tokens, "", ','); REQUIRE(tokens.empty() == true); @@ -847,7 +847,7 @@ TEST_CASE("stringuntils splitToIntVector 1", "") TEST_CASE("stringuntils splitToStringVector 1", "") { - std::vector<std::string> tokens; + STD_VECTOR<std::string> tokens; splitToStringVector(tokens, "", ','); REQUIRE(tokens.empty() == true); diff --git a/src/unittests/utils/xmlutils_unittest.cc b/src/unittests/utils/xmlutils_unittest.cc index 014730e95..c17ca98e4 100644 --- a/src/unittests/utils/xmlutils_unittest.cc +++ b/src/unittests/utils/xmlutils_unittest.cc @@ -73,7 +73,7 @@ TEST_CASE("xmlutils readXmlIntVector 1", "") ActorSprite::load(); - std::vector<int> arr; + STD_VECTOR<int> arr; readXmlIntVector("graphics/gui/browserbox.xml", "skinset", |