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

Fix warnings in array and assoc containers

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@242629 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2015-07-18 23:56:04 +00:00
parent 47c5dae573
commit 02bb4bdb49
22 changed files with 96 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/std/containers/sequences/array/array.tuple/get.fail.cpp
View File

@@ -11,15 +11,22 @@
// template <size_t I, class T, size_t N> T& get(array<T, N>& a);
// Prevent -Warray-bounds from issuing a diagnostic when testing with clang verify.
#if defined(__clang__)
#pragma clang diagnostic ignored "-Warray-bounds"
#endif
#include <array>
#include <cassert>
#include "../suppress_array_warnings.h"
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!
std::get<3>(c) = 5.5; // expected-error@array:* {{static_assert failed "Index out of bounds in std::get<> (std::array)"}}
}
}

11
test/std/containers/sequences/array/array.tuple/get.pass.cpp
View File

@@ -14,12 +14,17 @@
#include <array>
#include <cassert>
#if __cplusplus > 201103L
#include "test_macros.h"
#include "../suppress_array_warnings.h"
#if TEST_STD_VER > 11
struct S {
std::array<int, 3> a;
int k;
constexpr S() : a{1,2,3}, k(std::get<2>(a)) {}
};
};
constexpr std::array<int, 2> getArr () { return { 3, 4 }; }
#endif
@@ -35,7 +40,7 @@ int main()
assert(c[1] == 5.5);
assert(c[2] == 3.5);
}
#if _LIBCPP_STD_VER > 11
#if TEST_STD_VER > 11
{
typedef double T;
typedef std::array<T, 3> C;

6
test/std/containers/sequences/array/array.tuple/get_const.pass.cpp
View File

@@ -14,6 +14,10 @@
#include <array>
#include <cassert>
#include "test_macros.h"
#include "../suppress_array_warnings.h"
int main()
{
{
@@ -24,7 +28,7 @@ int main()
assert(std::get<1>(c) == 2);
assert(std::get<2>(c) == 3.5);
}
#if _LIBCPP_STD_VER > 11
#if TEST_STD_VER > 11
{
typedef double T;
typedef std::array<T, 3> C;

7
test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp
View File

@@ -11,14 +11,18 @@
// template <size_t I, class T, size_t N> T&& get(array<T, N>&& a);
// UNSUPPORTED: c++98, c++03
#include <array>
#include <memory>
#include <utility>
#include <cassert>
#include "../suppress_array_warnings.h"
int main()
{
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
typedef std::unique_ptr<double> T;
typedef std::array<T, 1> C;
@@ -26,5 +30,4 @@ int main()
T t = std::get<0>(std::move(c));
assert(*t == 3.5);
}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}