diff mbox

Add constexpr to iterator adaptors, array and range access

Message ID 20160823155501.GG20016@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely Aug. 23, 2016, 3:55 p.m. UTC 
On 23/08/16 11:16 +0100, Jonathan Wakely wrote:
>On 16/07/16 14:55 +0200, Daniel Krügler wrote:
>>Since I made a similar (unintentional) omission recently myself:
>>Shouldn't you touch std::__debug::array as well? What about other
>>functions from std::__debug?
>
>Yes, I'll fix those shortly.

Here's the update for debug and profile modes.

I didn't wait for the profile mode tests to finish because I have more
important things to do, i.e. pretty much anything I can think of.

Committed to trunk.
diff mbox

Patch

commit cd738b74460efce03114f058ee020f9bc09308ac
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Aug 23 12:14:28 2016 +0100

    Add C++17 constexpr to debug and profile mode arrays
    
    	* include/debug/array (array): Add _GLIBCXX17_CONSTEXPR.
    	* include/profile/array (array): Likewise.
    	(array::swap): Fix exception specification for zero-sized arrays.

diff --git a/libstdc++-v3/include/debug/array b/libstdc++-v3/include/debug/array
index 6d51309..48ab2fd 100644
--- a/libstdc++-v3/include/debug/array
+++ b/libstdc++-v3/include/debug/array
@@ -90,66 +90,66 @@  namespace __debug
       { std::swap_ranges(begin(), end(), __other.begin()); }
 
       // Iterators.
-      iterator
+      _GLIBCXX17_CONSTEXPR iterator
       begin() noexcept
       { return iterator(data()); }
 
-      const_iterator
+      _GLIBCXX17_CONSTEXPR const_iterator
       begin() const noexcept
       { return const_iterator(data()); }
 
-      iterator
+      _GLIBCXX17_CONSTEXPR iterator
       end() noexcept
       { return iterator(data() + _Nm); }
 
-      const_iterator
+      _GLIBCXX17_CONSTEXPR const_iterator
       end() const noexcept
       { return const_iterator(data() + _Nm); }
 
-      reverse_iterator 
+      _GLIBCXX17_CONSTEXPR reverse_iterator
       rbegin() noexcept
       { return reverse_iterator(end()); }
 
-      const_reverse_iterator 
+      _GLIBCXX17_CONSTEXPR const_reverse_iterator
       rbegin() const noexcept
       { return const_reverse_iterator(end()); }
 
-      reverse_iterator 
+      _GLIBCXX17_CONSTEXPR reverse_iterator
       rend() noexcept
       { return reverse_iterator(begin()); }
 
-      const_reverse_iterator 
+      _GLIBCXX17_CONSTEXPR const_reverse_iterator
       rend() const noexcept
       { return const_reverse_iterator(begin()); }
 
-      const_iterator
+      _GLIBCXX17_CONSTEXPR const_iterator
       cbegin() const noexcept
       { return const_iterator(data()); }
 
-      const_iterator
+      _GLIBCXX17_CONSTEXPR const_iterator
       cend() const noexcept
       { return const_iterator(data() + _Nm); }
 
-      const_reverse_iterator 
+      _GLIBCXX17_CONSTEXPR const_reverse_iterator
       crbegin() const noexcept
       { return const_reverse_iterator(end()); }
 
-      const_reverse_iterator 
+      _GLIBCXX17_CONSTEXPR const_reverse_iterator
       crend() const noexcept
       { return const_reverse_iterator(begin()); }
 
       // Capacity.
-      constexpr size_type 
+      constexpr size_type
       size() const noexcept { return _Nm; }
 
-      constexpr size_type 
+      constexpr size_type
       max_size() const noexcept { return _Nm; }
 
-      constexpr bool 
+      constexpr bool
       empty() const noexcept { return size() == 0; }
 
       // Element access.
-      reference
+      _GLIBCXX17_CONSTEXPR reference
       operator[](size_type __n) noexcept
       {
 	__glibcxx_check_subscript(__n);
@@ -164,7 +164,7 @@  namespace __debug
 	    _AT_Type::_S_ref(_M_elems, 0));
       }
 
-      reference
+      _GLIBCXX17_CONSTEXPR reference
       at(size_type __n)
       {
 	if (__n >= _Nm)
@@ -186,14 +186,14 @@  namespace __debug
 	     _AT_Type::_S_ref(_M_elems, 0));
       }
 
-      reference 
+      _GLIBCXX17_CONSTEXPR reference
       front() noexcept
       {
 	__glibcxx_check_nonempty();
 	return *begin();
       }
 
-      constexpr const_reference 
+      constexpr const_reference
       front() const noexcept
       {
 	return _Nm ? _AT_Type::_S_ref(_M_elems, 0)
@@ -201,14 +201,14 @@  namespace __debug
 	     _AT_Type::_S_ref(_M_elems, 0));
       }
 
-      reference 
+      _GLIBCXX17_CONSTEXPR reference
       back() noexcept
       {
 	__glibcxx_check_nonempty();
 	return _Nm ? *(end() - 1) : *end();
       }
 
-      constexpr const_reference 
+      constexpr const_reference
       back() const noexcept
       {
 	return _Nm ? _AT_Type::_S_ref(_M_elems, _Nm - 1)
@@ -216,18 +216,18 @@  namespace __debug
 	     _AT_Type::_S_ref(_M_elems, 0));
       }
 
-      pointer
+      _GLIBCXX17_CONSTEXPR pointer
       data() noexcept
       { return _AT_Type::_S_ptr(_M_elems); }
 
-      const_pointer
+      _GLIBCXX17_CONSTEXPR const_pointer
       data() const noexcept
       { return _AT_Type::_S_ptr(_M_elems); }
     };
 
   // Array comparisons.
   template<typename _Tp, std::size_t _Nm>
-    inline bool 
+    inline bool
     operator==(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
     { return std::equal(__one.begin(), __one.end(), __two.begin()); }
 
@@ -239,9 +239,9 @@  namespace __debug
   template<typename _Tp, std::size_t _Nm>
     inline bool
     operator<(const array<_Tp, _Nm>& __a, const array<_Tp, _Nm>& __b)
-    { 
+    {
       return std::lexicographical_compare(__a.begin(), __a.end(),
-					  __b.begin(), __b.end()); 
+					  __b.begin(), __b.end());
     }
 
   template<typename _Tp, std::size_t _Nm>
diff --git a/libstdc++-v3/include/profile/array b/libstdc++-v3/include/profile/array
index cc26f66..eedbdac 100644
--- a/libstdc++-v3/include/profile/array
+++ b/libstdc++-v3/include/profile/array
@@ -65,55 +65,55 @@  namespace __profile
 
       void
       swap(array& __other)
-      noexcept(__is_nothrow_swappable<_Tp>::value)
+      noexcept(_AT_Type::_Is_nothrow_swappable::value)
       { std::swap_ranges(begin(), end(), __other.begin()); }
 
       // Iterators.
-      iterator
+      _GLIBCXX17_CONSTEXPR iterator
       begin() noexcept
       { return iterator(data()); }
 
-      const_iterator
+      _GLIBCXX17_CONSTEXPR const_iterator
       begin() const noexcept
       { return const_iterator(data()); }
 
-      iterator
+      _GLIBCXX17_CONSTEXPR iterator
       end() noexcept
       { return iterator(data() + _Nm); }
 
-      const_iterator
+      _GLIBCXX17_CONSTEXPR const_iterator
       end() const noexcept
       { return const_iterator(data() + _Nm); }
 
-      reverse_iterator
+      _GLIBCXX17_CONSTEXPR reverse_iterator
       rbegin() noexcept
       { return reverse_iterator(end()); }
 
-      const_reverse_iterator
+      _GLIBCXX17_CONSTEXPR const_reverse_iterator
       rbegin() const noexcept
       { return const_reverse_iterator(end()); }
 
-      reverse_iterator
+      _GLIBCXX17_CONSTEXPR reverse_iterator
       rend() noexcept
       { return reverse_iterator(begin()); }
 
-      const_reverse_iterator
+      _GLIBCXX17_CONSTEXPR const_reverse_iterator
       rend() const noexcept
       { return const_reverse_iterator(begin()); }
 
-      const_iterator
+      _GLIBCXX17_CONSTEXPR const_iterator
       cbegin() const noexcept
       { return const_iterator(data()); }
 
-      const_iterator
+      _GLIBCXX17_CONSTEXPR const_iterator
       cend() const noexcept
       { return const_iterator(data() + _Nm); }
 
-      const_reverse_iterator
+      _GLIBCXX17_CONSTEXPR const_reverse_iterator
       crbegin() const noexcept
       { return const_reverse_iterator(end()); }
 
-      const_reverse_iterator
+      _GLIBCXX17_CONSTEXPR const_reverse_iterator
       crend() const noexcept
       { return const_reverse_iterator(begin()); }
 
@@ -136,7 +136,7 @@  namespace __profile
       operator[](size_type __n) const noexcept
       { return _AT_Type::_S_ref(_M_elems, __n); }
 
-      reference
+      _GLIBCXX17_CONSTEXPR reference
       at(size_type __n)
       {
 	if (__n >= _Nm)
@@ -159,7 +159,7 @@  namespace __profile
 	     _AT_Type::_S_ref(_M_elems, 0));
       }
 
-      reference
+      _GLIBCXX17_CONSTEXPR reference
       front() noexcept
       { return *begin(); }
 
@@ -167,7 +167,7 @@  namespace __profile
       front() const noexcept
       { return _AT_Type::_S_ref(_M_elems, 0); }
 
-      reference
+      _GLIBCXX17_CONSTEXPR reference
       back() noexcept
       { return _Nm ? *(end() - 1) : *end(); }
 
@@ -178,11 +178,11 @@  namespace __profile
 		   : _AT_Type::_S_ref(_M_elems, 0);
       }
 
-      pointer
+      _GLIBCXX17_CONSTEXPR pointer
       data() noexcept
       { return _AT_Type::_S_ptr(_M_elems); }
 
-      const_pointer
+      _GLIBCXX17_CONSTEXPR const_pointer
       data() const noexcept
       { return _AT_Type::_S_ptr(_M_elems); }
     };