Commit b7b61489 by Jonathan Wakely Committed by Jonathan Wakely

Fix -Wempty-body warnings for debug assertions

	* include/bits/node_handle.h (_Node_handle_common::operator=)
	(_Node_handle_common::_M_swap): Add braces around debug assertions.

From-SVN: r255317
parent f1338a2d
2017-12-01 Jonathan Wakely <jwakely@redhat.com> 2017-12-01 Jonathan Wakely <jwakely@redhat.com>
* include/bits/node_handle.h (_Node_handle_common::operator=)
(_Node_handle_common::_M_swap): Add braces around debug assertions.
* include/ext/ropeimpl.h (rope::_S_dump): Use const char*. * include/ext/ropeimpl.h (rope::_S_dump): Use const char*.
* libsupc++/nested_exception.h (__throw_with_nested_impl): Add * libsupc++/nested_exception.h (__throw_with_nested_impl): Add
......
...@@ -87,10 +87,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -87,10 +87,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|| !this->_M_alloc) || !this->_M_alloc)
this->_M_alloc = std::move(__nh._M_alloc); this->_M_alloc = std::move(__nh._M_alloc);
else else
{
__glibcxx_assert(this->_M_alloc == __nh._M_alloc); __glibcxx_assert(this->_M_alloc == __nh._M_alloc);
} }
}
else else
{
__glibcxx_assert(_M_alloc); __glibcxx_assert(_M_alloc);
}
__nh._M_ptr = nullptr; __nh._M_ptr = nullptr;
__nh._M_alloc = nullopt; __nh._M_alloc = nullopt;
return *this; return *this;
...@@ -109,8 +113,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -109,8 +113,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|| !_M_alloc || !__nh._M_alloc) || !_M_alloc || !__nh._M_alloc)
_M_alloc.swap(__nh._M_alloc); _M_alloc.swap(__nh._M_alloc);
else else
{
__glibcxx_assert(_M_alloc == __nh._M_alloc); __glibcxx_assert(_M_alloc == __nh._M_alloc);
} }
}
private: private:
void void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment