diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/variant | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a82da55..b89330b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2016-09-05 Mikhail Strelnikov <mikhail.strelnikov@gmail.com> + + * include/std/variant (_Variant_storage::_M_storage()): Use std::addressof + instead of operator& to take address. + 2016-09-02 Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> * acinclude.m4 (GLIBCXX_CONFIGURE_TESTSUITE): Check for presence of diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index a9b4394..be25438 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -312,7 +312,7 @@ namespace __variant _M_storage() const { return const_cast<void*>( - static_cast<const void*>(&_M_first._M_storage)); + static_cast<const void*>(std::addressof(_M_first._M_storage))); } union |