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 | |
parent | 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff) | |
download | manaplus-311c175f3184103950c72bc5c775174597430b83.tar.gz manaplus-311c175f3184103950c72bc5c775174597430b83.tar.bz2 manaplus-311c175f3184103950c72bc5c775174597430b83.tar.xz manaplus-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')
-rw-r--r-- | src/unittests/fs/virtfs/zip_unittest.cc | 16 | ||||
-rw-r--r-- | src/unittests/render/mockgraphics.h | 2 | ||||
-rw-r--r-- | src/unittests/utils/stringutils_unittest.cc | 6 | ||||
-rw-r--r-- | src/unittests/utils/xmlutils_unittest.cc | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/unittests/fs/virtfs/zip_unittest.cc b/src/unittests/fs/virtfs/zip_unittest.cc index 10b4b52b5..6ea9063fe 100644 --- a/src/unittests/fs/virtfs/zip_unittest.cc +++ b/src/unittests/fs/virtfs/zip_unittest.cc @@ -51,7 +51,7 @@ TEST_CASE("Zip readArchiveInfo", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 2); @@ -73,7 +73,7 @@ TEST_CASE("Zip readArchiveInfo", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 11); @@ -136,7 +136,7 @@ TEST_CASE("Zip readArchiveInfo", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 2); @@ -158,7 +158,7 @@ TEST_CASE("Zip readArchiveInfo", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(entry->root == name); @@ -190,7 +190,7 @@ TEST_CASE("Zip readCompressedFile", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 11); @@ -225,7 +225,7 @@ TEST_CASE("Zip readFile", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 2); @@ -250,7 +250,7 @@ TEST_CASE("Zip readFile", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 11); @@ -282,7 +282,7 @@ TEST_CASE("Zip readFile", "") VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, dirSeparator, VirtFs::FsZip::getFuncs()); - std::vector<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; + STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); REQUIRE(headers.size() == 2); diff --git a/src/unittests/render/mockgraphics.h b/src/unittests/render/mockgraphics.h index c18e6acd1..e144cef02 100644 --- a/src/unittests/render/mockgraphics.h +++ b/src/unittests/render/mockgraphics.h @@ -48,7 +48,7 @@ class MockGraphics final : public Graphics #include "render/softwaregraphicsdef.hpp" RENDER_SOFTWAREGRAPHICSDEF_HPP - std::vector<MockDrawItem> mDraws; + STD_VECTOR<MockDrawItem> mDraws; }; #endif // UNITTESTS 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", |