boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-09 15:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect dereferenceable<> against overloaded operator&, fixes #35

Browse Source
This commit is contained in:
Daniel Frey 2017-11-23 21:14:07 +01:00
parent a6c175e2c3
commit ad0fc7c9d3
No known key found for this signature in database
GPG Key ID: 014C496DEC39EB21
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/operators.hpp
View File

@ -9,6 +9,7 @@
// See http://www.boost.org/libs/utility/operators.htm for documentation. // See http://www.boost.org/libs/utility/operators.htm for documentation.
// Revision History // Revision History
// 23 Nov 17 Protect dereferenceable<> from overloaded operator&.
// 15 Oct 17 Adapted to C++17, replace std::iterator<> with manual // 15 Oct 17 Adapted to C++17, replace std::iterator<> with manual
// implementation. // implementation.
// 22 Feb 16 Added ADL protection, preserve old work-arounds in // 22 Feb 16 Added ADL protection, preserve old work-arounds in
@ -98,6 +99,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <boost/core/addressof.hpp>
#if defined(__sgi) && !defined(__GNUC__) #if defined(__sgi) && !defined(__GNUC__)
# pragma set woff 1234 # pragma set woff 1234
@ -302,7 +304,7 @@ struct dereferenceable : B
{ {
P operator->() const P operator->() const
{ {
return &*static_cast<const T&>(*this); return ::boost::addressof(*static_cast<const T&>(*this));
} }
}; };

4
operators.htm
View File

@ -1667,8 +1667,8 @@ T operator+( T lhs, const T&amp; rhs )
<td><code>P operator-&gt;() const</code></td> <td><code>P operator-&gt;() const</code></td>
<td><code>(&amp;*i)</code>. Return convertible to <td><code>*i</code>. Address of the returned value convertible
<code>P</code>.</td> to <code>P</code>.</td>
</tr> </tr>
<tr> <tr>