diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-04-15 19:28:41 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-04-15 19:28:41 +0100 |
| commit | 260d16c8ca780a9ddd022cc5a733fc20229f6e7b (patch) | |
| tree | 0ac5315c760b07bcf3326c4aa95543c20d7501f8 | |
| parent | dfe449d152247bdef54c59b48de03abc0a4aa228 (diff) | |
| download | gcc-260d16c8ca780a9ddd022cc5a733fc20229f6e7b.zip gcc-260d16c8ca780a9ddd022cc5a733fc20229f6e7b.tar.gz gcc-260d16c8ca780a9ddd022cc5a733fc20229f6e7b.tar.bz2 | |
atomic_base.h (__atomic_base<_PTp*>::_M_type_size): Add const to constexpr member functions.
* include/bits/atomic_base.h (__atomic_base<_PTp*>::_M_type_size): Add
const to constexpr member functions.
From-SVN: r209427
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_base.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e9b4a7c..de81ec7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -12,6 +12,9 @@ from the callable checks. * testsuite/20_util/function/60594.cc: New. + * include/bits/atomic_base.h (__atomic_base<_PTp*>::_M_type_size): Add + const to constexpr member functions. + 2014-04-14 Jonathan Wakely <jwakely@redhat.com> * include/bits/stl_vector.h (_Vector_base::_Vector_impl, diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h index 242459a..1fc0ebb 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; |