From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 15 Apr 2014 18:28:41 +0000 (+0100)
Subject: atomic_base.h (__atomic_base<_PTp*>::_M_type_size): Add const to constexpr member... 
X-Git-Tag: releases/gcc-5.1.0~8100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=260d16c8ca780a9ddd022cc5a733fc20229f6e7b;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e9b4a7c18350..de81ec7c0500 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 242459ad01e7..1fc0ebb7e40e 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;