diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-04 18:50:04 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-04 18:50:04 +0000 |
| commit | 819c64757868008d40bf2089707e44743a56ffa4 (patch) | |
| tree | aa54d35cdbf9c72d924bd56ee54848a97bb825ab /libstdc++-v3 | |
| parent | 80499193c07a95264a3438d79d420cdbe4be0428 (diff) | |
| download | ppe42-gcc-819c64757868008d40bf2089707e44743a56ffa4.tar.gz ppe42-gcc-819c64757868008d40bf2089707e44743a56ffa4.zip | |
Backported from mainline
2014-04-15 Jonathan Wakely <jwakely@redhat.com>
* include/bits/atomic_base.h (__atomic_base<_PTp*>::_M_type_size): Add
const to constexpr member functions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@213600 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_base.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 09b7017cdc8..62191da82c5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2014-08-04 Jonathan Wakely <jwakely@redhat.com> + + Backported from mainline + 2014-04-15 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/atomic_base.h (__atomic_base<_PTp*>::_M_type_size): Add + const to constexpr member functions. + 2014-07-29 Ed Smith-Rowland <3dw4rd@verizon.net> PR libstdc++/60037 - SIGFPE in std::generate_canonical<unsigned int...> diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h index 242459ad01e..1fc0ebb7e40 100644 --- a/libstdc++-v3/include/bits/atomic_base.h +++ b/libstdc++-v3/include/bits/atomic_base.h @@ -675,10 +675,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Factored out to facilitate explicit specialization. constexpr ptrdiff_t - _M_type_size(ptrdiff_t __d) { return __d * sizeof(_PTp); } + _M_type_size(ptrdiff_t __d) const { return __d * sizeof(_PTp); } constexpr ptrdiff_t - _M_type_size(ptrdiff_t __d) volatile { return __d * sizeof(_PTp); } + _M_type_size(ptrdiff_t __d) const volatile { return __d * sizeof(_PTp); } public: __atomic_base() noexcept = default; |
