diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-02-07 23:50:25 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-02-07 23:50:25 +0000 |
| commit | 1a78ae3c895d0520bbb8ad2f154e737d52fe7ae2 (patch) | |
| tree | e34d2a482daab62cc393157715037037426b6c28 /libcxx/include/array | |
| parent | 06ac8cfbd103b2a024d6c1c01ae8912ebce523a0 (diff) | |
| download | bcm5719-llvm-1a78ae3c895d0520bbb8ad2f154e737d52fe7ae2.tar.gz bcm5719-llvm-1a78ae3c895d0520bbb8ad2f154e737d52fe7ae2.zip | |
Fix size and alignment of array<T, 0>.
An array T[1] isn't necessarily the same say when it's
a member of a struct. This patch addresses that problem and corrects
the tests to deal with it.
llvm-svn: 324545
Diffstat (limited to 'libcxx/include/array')
| -rw-r--r-- | libcxx/include/array | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/include/array b/libcxx/include/array index 706e573dbed..fdb1f9dae53 100644 --- a/libcxx/include/array +++ b/libcxx/include/array @@ -244,10 +244,11 @@ struct _LIBCPP_TEMPLATE_VIS array<_Tp, 0> typedef std::reverse_iterator<iterator> reverse_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; - typedef typename conditional<is_const<_Tp>::value, const char, char>::type _CharType; - _ALIGNAS(alignment_of<_Tp[1]>::value) _CharType __elems_[sizeof(_Tp[1])]; + + struct _ArrayInStructT { _Tp __data_[1]; }; + _ALIGNAS_TYPE(_ArrayInStructT) _CharType __elems_[sizeof(_ArrayInStructT)]; // No explicit construct/copy/destroy for aggregate type _LIBCPP_INLINE_VISIBILITY void fill(const value_type&) { |
