aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Strelnikov <mikhail.strelnikov@gmail.com>2016-09-05 19:40:44 +0000
committerTim Shen <timshen@gcc.gnu.org>2016-09-05 19:40:44 +0000
commiteddca7bd73bcd4a322282d3170beea0c047ee0fb (patch)
tree5428ad12f607b1f482e0440ca1df3a42811bb935
parent2ba1f597c2761ba5edffd0fa7c7e231b8cc85c08 (diff)
downloadgcc-eddca7bd73bcd4a322282d3170beea0c047ee0fb.zip
gcc-eddca7bd73bcd4a322282d3170beea0c047ee0fb.tar.gz
gcc-eddca7bd73bcd4a322282d3170beea0c047ee0fb.tar.bz2
variant (_Variant_storage::_M_storage()): Use std::addressof instead of operator& to take address.
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. From-SVN: r239996
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/variant2
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