atomic_base.h (__atomic_base<_PTp*>::_M_type_size): Add const to constexpr member...

	* include/bits/atomic_base.h (__atomic_base<_PTp*>::_M_type_size): Add
	const to constexpr member functions.

From-SVN: r209427

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e9b4a7c183501e47d2b5cc50fe6fdba29442346d..de81ec7c0500810932d667b5fbcb9624eec50f80 100644 (file)
--- 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 242459ad01e77e58522199522e8c1859f8731fec..1fc0ebb7e40e071184bb45aa432ad2bdad7211ba 100644 (file)
--- 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;