diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/array | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7819e9e..cf5a2a8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2004-10-16 Benjamin Kosnik <bkoz@redhat.com> + + * include/tr1/array: Don't use layout_type. + +2004-10-16 Sashan Govender <sashang@gmail.com> + + * include/tr1/array (array::end const): Fix casting from iterator + to const_iterator. + 2004-10-15 Paolo Carlini <pcarlini@suse.de> * include/ext/bitmap_allocator.h: Qualify ::operator delete. diff --git a/libstdc++-v3/include/tr1/array b/libstdc++-v3/include/tr1/array index e41fced..7f092ad 100644 --- a/libstdc++-v3/include/tr1/array +++ b/libstdc++-v3/include/tr1/array @@ -55,9 +55,8 @@ namespace tr1 typedef ptrdiff_t difference_type; typedef std::reverse_iterator<iterator> reverse_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; - typedef char layout_type[sizeof(_Tp)] __attribute__ ((aligned(__alignof__(_Tp)))); - layout_type _M_instance[_Nm]; + value_type _M_instance[_Nm]; // No explicit construct/copy/destroy for aggregate type. @@ -82,7 +81,7 @@ namespace tr1 const_iterator end() const - { return reinterpret_cast<iterator>(&_M_instance[_S_index - 1]); } + { return reinterpret_cast<const_iterator>(&_M_instance[_S_index - 1]); } reverse_iterator rbegin() |