diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-12-05 19:25:48 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2006-12-05 19:25:48 +0000 |
| commit | 4091894c314fb61a74c1798dc55c1dbd0568362e (patch) | |
| tree | 9b800f96aaf5df5ba35a62b48ee1768f69197664 /libstdc++-v3/include | |
| parent | 58660eb32cbccdf0a464141b58c5d668096b503a (diff) | |
| download | gcc-4091894c314fb61a74c1798dc55c1dbd0568362e.zip gcc-4091894c314fb61a74c1798dc55c1dbd0568362e.tar.gz gcc-4091894c314fb61a74c1798dc55c1dbd0568362e.tar.bz2 | |
DR 543, [Ready].
2006-12-05 Paolo Carlini <pcarlini@suse.de>
DR 543, [Ready].
* include/bits/slice_array.h (slice::slice()): Implement the
resolution.
* include/bits/gslice.h (gslice::_Indexer::_Indexer()): Add.
(gslice::gslice()): Use it.
* testsuite/26_numerics/valarray/dr543.cc: New.
* docs/html/ext/howto.html: Add an entry for DR 543.
From-SVN: r119552
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/bits/gslice.h | 26 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/slice_array.h | 9 |
2 files changed, 23 insertions, 12 deletions
diff --git a/libstdc++-v3/include/bits/gslice.h b/libstdc++-v3/include/bits/gslice.h index 560aeb5..1afda4b 100644 --- a/libstdc++-v3/include/bits/gslice.h +++ b/libstdc++-v3/include/bits/gslice.h @@ -1,6 +1,6 @@ // The template and inlines for the -*- C++ -*- gslice class. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -64,7 +64,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { public: /// Construct an empty slice. - gslice (); + gslice(); /** * @brief Construct a slice. @@ -108,8 +108,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) valarray<size_t> _M_size; valarray<size_t> _M_stride; valarray<size_t> _M_index; // Linear array of referenced indices + + _Indexer() + : _M_count(1), _M_start(0), _M_size(), _M_stride(), _M_index() {} + _Indexer(size_t, const valarray<size_t>&, const valarray<size_t>&); + void _M_increment_use() { ++_M_count; } @@ -125,18 +130,22 @@ _GLIBCXX_BEGIN_NAMESPACE(std) }; inline size_t - gslice::start () const + gslice::start() const { return _M_index ? _M_index->_M_start : 0; } inline valarray<size_t> - gslice::size () const + gslice::size() const { return _M_index ? _M_index->_M_size : valarray<size_t>(); } inline valarray<size_t> - gslice::stride () const + gslice::stride() const { return _M_index ? _M_index->_M_stride : valarray<size_t>(); } - inline gslice::gslice () : _M_index(0) {} + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 543. valarray slice default constructor + inline + gslice::gslice() + : _M_index(new gslice::_Indexer()) {} inline gslice::gslice(size_t __o, const valarray<size_t>& __l, @@ -144,7 +153,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) : _M_index(new gslice::_Indexer(__o, __l, __s)) {} inline - gslice::gslice(const gslice& __g) : _M_index(__g._M_index) + gslice::gslice(const gslice& __g) + : _M_index(__g._M_index) { if (_M_index) _M_index->_M_increment_use(); } inline @@ -155,7 +165,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } inline gslice& - gslice::operator= (const gslice& __g) + gslice::operator=(const gslice& __g) { if (__g._M_index) __g._M_index->_M_increment_use(); diff --git a/libstdc++-v3/include/bits/slice_array.h b/libstdc++-v3/include/bits/slice_array.h index 41debfe..d9ffad5 100644 --- a/libstdc++-v3/include/bits/slice_array.h +++ b/libstdc++-v3/include/bits/slice_array.h @@ -1,6 +1,6 @@ // The template and inlines for the -*- C++ -*- slice_array class. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -83,10 +83,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) size_t _M_st; // stride unit }; - // The default constructor constructor is not required to initialize - // data members with any meaningful values, so we choose to do nothing. + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 543. valarray slice default constructor inline - slice::slice() {} + slice::slice() + : _M_off(0), _M_sz(0), _M_st(0) {} inline slice::slice(size_t __o, size_t __d, size_t __s) |