This is an archive of the discontinued LLVM Phabricator instance.

Differential D19565

[libc++] Fix an accidental assignment within assert() that should have been equality.
ClosedPublic

Authored by STL_MSFT on Apr 26 2016, 3:43 PM.

Details

Reviewers
mclow.lists
EricWF
Summary

[libc++] Fix an accidental assignment within assert() that should have been equality.

Fixes MSVC "warning C4706: assignment within conditional expression".

Diff Detail

Event Timeline

STL_MSFT updated this revision to Diff 55113.Apr 26 2016, 3:43 PM
STL_MSFT retitled this revision from to [libc++] Fix an accidental assignment within assert() that should have been equality..
STL_MSFT updated this object.
STL_MSFT added reviewers: EricWF, mclow.lists.
STL_MSFT added a subscriber: cfe-commits.
mclow.lists accepted this revision.Apr 26 2016, 6:44 PM
mclow.lists edited edge metadata.

Whoops! LGTM.

This revision is now accepted and ready to land.Apr 26 2016, 6:44 PM
mclow.lists closed this revision.Apr 26 2016, 6:52 PM

Committed as revision 267654.

Revision Contents

PathSize
test/
std/
containers/
associative/
map/
2 lines

Diff 55113

test/std/containers/associative/map/compare.pass.cpp

Show All 38 Lines typedef std::pair<Iter, bool> IterBool;
assert(it == m_empty.end()); assert(it == m_empty.end());
it = m_contains.find(Key(0)); it = m_contains.find(Key(0));
assert(it != m_contains.end()); assert(it != m_contains.end());
} }
{ {
MapT map; MapT map;
IterBool result = map.insert(std::make_pair(Key(0), 42)); IterBool result = map.insert(std::make_pair(Key(0), 42));
assert(result.second); assert(result.second);
assert(result.first->second = 42); assert(result.first->second == 42);
IterBool result2 = map.insert(std::make_pair(Key(0), 43)); IterBool result2 = map.insert(std::make_pair(Key(0), 43));
assert(!result2.second); assert(!result2.second);
assert(map[Key(0)] == 42); assert(map[Key(0)] == 42);
} }
} }