generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added static_assert to std::get<N>(std::array) calls to catch "out of bounds" calls

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@170435 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2012-12-18 16:46:30 +00:00
parent 3d4f92c08a
commit a46482e8bb
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/array
View File

@ -310,6 +310,7 @@ _LIBCPP_INLINE_VISIBILITY inline
_Tp& _Tp&
get(array<_Tp, _Size>& __a) _NOEXCEPT get(array<_Tp, _Size>& __a) _NOEXCEPT
{ {
static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::array)");
return __a[_Ip]; return __a[_Ip];
} }
@ -318,6 +319,7 @@ _LIBCPP_INLINE_VISIBILITY inline
const _Tp& const _Tp&
get(const array<_Tp, _Size>& __a) _NOEXCEPT get(const array<_Tp, _Size>& __a) _NOEXCEPT
{ {
static_assert(_Ip < _Size, "Index out of bounds in std::get<> (const std::array)");
return __a[_Ip]; return __a[_Ip];
} }
@ -328,6 +330,7 @@ _LIBCPP_INLINE_VISIBILITY inline
_Tp&& _Tp&&
get(array<_Tp, _Size>&& __a) _NOEXCEPT get(array<_Tp, _Size>&& __a) _NOEXCEPT
{ {
static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::array &&)");
return _VSTD::move(__a[_Ip]); return _VSTD::move(__a[_Ip]);
} }

25
test/containers/sequences/array/array.tuple/get.fail.cpp Normal file
View File

@ -0,0 +1,25 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <array>
// template <size_t I, class T, size_t N> T& get(array<T, N>& a);
#include <array>
#include <cassert>
int main()
{
{
typedef double T;
typedef std::array<T, 3> C;
C c = {1, 2, 3.5};
std::get<3>(c) = 5.5; // Can't get element 3!
}
}