summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities/tuple/tuple.tuple
diff options
context:
space:
mode:
authorStephan T. Lavavej <stl@exchange.microsoft.com>2017-06-20 21:10:53 +0000
committerStephan T. Lavavej <stl@exchange.microsoft.com>2017-06-20 21:10:53 +0000
commit73f7f8df2b92e262c97dd8e3642a6e2fbf82b54e (patch)
tree74d6812c3e7505392d939b6e67bc92f498752d1b /libcxx/test/std/utilities/tuple/tuple.tuple
parent25422dcccbf4b4030c20ab3900a5a61c38f744e0 (diff)
downloadbcm5719-llvm-73f7f8df2b92e262c97dd8e3642a6e2fbf82b54e.tar.gz
bcm5719-llvm-73f7f8df2b92e262c97dd8e3642a6e2fbf82b54e.zip
[libcxx] [test] Fix -Wmismatched-tags in tuple_size_structured_bindings.pass.cpp.
Clang and C1XX both complain about mismatched class/struct, but libc++ and MSVC's STL differ on what they use for tuple_element/tuple_size, so there's no way to win here. I'm reverting this part of my previous change. In the future, I'll have to suppress the warning for one compiler or the other. llvm-svn: 305854
Diffstat (limited to 'libcxx/test/std/utilities/tuple/tuple.tuple')
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp
index fdd60663ce3..03fb78caa08 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp
@@ -117,7 +117,8 @@ template <size_t N>
int get(Test const&) { static_assert(N == 0, ""); return -1; }
template <>
-struct std::tuple_element<0, Test> {
+class std::tuple_element<0, Test> {
+public:
typedef int type;
};
@@ -128,7 +129,8 @@ void test_before_tuple_size_specialization() {
}
template <>
-struct std::tuple_size<Test> {
+class std::tuple_size<Test> {
+public:
static const size_t value = 1;
};
OpenPOWER on IntegriCloud