diff options
| author | Jason Merrill <jason@redhat.com> | 2010-11-01 21:31:50 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-11-01 21:31:50 -0400 |
| commit | 900484dee595d91a71c7ae63734c199bd137afc6 (patch) | |
| tree | a81889fc318d20d599750c915656f1365ed5f443 /libstdc++-v3 | |
| parent | 2bfe0527cd744a6f526fe11dd6c11ab39ad0a653 (diff) | |
| download | gcc-900484dee595d91a71c7ae63734c199bd137afc6.zip gcc-900484dee595d91a71c7ae63734c199bd137afc6.tar.gz gcc-900484dee595d91a71c7ae63734c199bd137afc6.tar.bz2 | |
initializer_list: Decorate with constexpr.
* libsupc++/initializer_list: Decorate with constexpr.
Co-Authored-By: Benjamin Kosnik <bkoz@redhat.com>
From-SVN: r166170
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/initializer_list | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 39f5325..510bc4e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2010-11-01 Jason Merrill <jason@redhat.com> + + * libsupc++/initializer_list: Decorate with constexpr. + 2010-11-01 Jonathan Wakely <jwakely.gcc@gmail.com> PR libstdc++/45999 diff --git a/libstdc++-v3/libsupc++/initializer_list b/libstdc++-v3/libsupc++/initializer_list index 0006b70..1048d44 100644 --- a/libstdc++-v3/libsupc++/initializer_list +++ b/libstdc++-v3/libsupc++/initializer_list @@ -57,23 +57,23 @@ namespace std size_type _M_len; // The compiler can call a private constructor. - initializer_list(const_iterator __a, size_type __l) + constexpr initializer_list(const_iterator __a, size_type __l) : _M_array(__a), _M_len(__l) { } public: - initializer_list() : _M_array(0), _M_len(0) { } + constexpr initializer_list() : _M_array(0), _M_len(0) { } // Number of elements. - size_type - size() const { return _M_len; } + constexpr size_type + size() { return _M_len; } // First element. - const_iterator - begin() const { return _M_array; } + constexpr const_iterator + begin() { return _M_array; } // One past the last element. - const_iterator - end() const { return begin() + size(); } + constexpr const_iterator + end() { return begin() + size(); } }; /** @@ -82,7 +82,7 @@ namespace std * @param il Initializer list. */ template<class _Tp> - inline const _Tp* + constexpr const _Tp* begin(initializer_list<_Tp> __ils) { return __ils.begin(); } @@ -92,7 +92,7 @@ namespace std * @param il Initializer list. */ template<class _Tp> - inline const _Tp* + constexpr const _Tp* end(initializer_list<_Tp> __ils) { return __ils.end(); } } |