nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1352073: Follow-up: don't use reserved() in opt builds; r=bustage

Browse source 
Also fix style to make it match local style.

MozReview-Commit-ID: D2HTik6HwxJ

--HG--
extra : rebase_source : 73d5a6d63597764d904f2d254ced08192871fdc0
This commit is contained in:
Benjamin Bouvier 2017-03-31 11:01:35 +02:00
parent 1ad92e7cc7
commit 1397cfaed9
1 changed files with 11 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
mfbt/tests/TestVector.cpp
View file

@ -368,7 +368,7 @@ mozilla::detail::VectorTesting::testInsert()
}
MOZ_RELEASE_ASSERT(vec.length() == 7);
MOZ_RELEASE_ASSERT(vec.reserved() == 8);
MOZ_ASSERT(vec.reserved() == 8);
MOZ_RELEASE_ASSERT(S::constructCount == 7);
MOZ_RELEASE_ASSERT(S::moveCount == 0);
MOZ_RELEASE_ASSERT(S::destructCount == 0);
@ -377,18 +377,19 @@ mozilla::detail::VectorTesting::testInsert()
MOZ_RELEASE_ASSERT(vec.insert(vec.begin() + 4, Move(s)));
for (size_t i = 0; i < vec.length(); i++) {
const S& s = vec[i];
MOZ_RELEASE_ASSERT(s.k);
if (i < 4)
MOZ_RELEASE_ASSERT(s.j == i && *s.k == i * i);
else if (i == 4)
MOZ_RELEASE_ASSERT(s.j == 42 && *s.k == 43);
else
MOZ_RELEASE_ASSERT(s.j == i - 1 && *s.k == (i - 1) * (i - 1));
const S& s = vec[i];
MOZ_RELEASE_ASSERT(s.k);
if (i < 4) {
MOZ_RELEASE_ASSERT(s.j == i && *s.k == i * i);
} else if (i == 4) {
MOZ_RELEASE_ASSERT(s.j == 42 && *s.k == 43);
} else {
MOZ_RELEASE_ASSERT(s.j == i - 1 && *s.k == (i - 1) * (i - 1));
}
}
MOZ_RELEASE_ASSERT(vec.length() == 8);
MOZ_RELEASE_ASSERT(vec.reserved() == 8);
MOZ_ASSERT(vec.reserved() == 8);
MOZ_RELEASE_ASSERT(S::constructCount == 8);
MOZ_RELEASE_ASSERT(S::moveCount == 1 /* move in insert() call */ +
1 /* move the back() element */ +