diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-20 21:49:12 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-20 21:49:12 +0000 |
| commit | c9c81ef3c667aaa14c498a5449ec6d134b4b66ff (patch) | |
| tree | 0ac440db6513ee01deb5e5dc6142769d1e5b7b2d /libstdc++-v3/include/std/variant | |
| parent | 12cdcb9d74f55c165366ca1b1eeec013a0ce72ef (diff) | |
| parent | 891196d7325e4c55d92d5ac5cfe7161c4f36c0ce (diff) | |
| download | gcc-fortran-dev.tar.gz | |
Merge from trunk (r239915 to r240230)fortran-dev
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/fortran-dev@240290 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/variant')
| -rw-r--r-- | libstdc++-v3/include/std/variant | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index a9b43944770..7dbb533dd83 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -38,6 +38,7 @@ #include <type_traits> #include <utility> #include <bits/enable_special_members.h> +#include <bits/move.h> #include <bits/uses_allocator.h> namespace std _GLIBCXX_VISIBILITY(default) @@ -312,7 +313,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 |