summaryrefslogtreecommitdiffstats
path: root/libcxx/test/utilities/tuple/tuple.tuple
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2014-10-07 21:42:12 +0000
committerMarshall Clow <mclow.lists@gmail.com>2014-10-07 21:42:12 +0000
commita2a481e0e3a2a7c59a990b17cb82b3ddea1bceae (patch)
tree2fc141cf7aa352df89f4efc2da49fb4f94f6c843 /libcxx/test/utilities/tuple/tuple.tuple
parent1f0227a4520f444f8f55a7d32607df3953f6be88 (diff)
downloadbcm5719-llvm-a2a481e0e3a2a7c59a990b17cb82b3ddea1bceae.tar.gz
bcm5719-llvm-a2a481e0e3a2a7c59a990b17cb82b3ddea1bceae.zip
Fix for PR 19616: 'tuple_cat of nested tuples fails in noexcept specification'. Thanks to Louis Dionne for the fix.
llvm-svn: 219243
Diffstat (limited to 'libcxx/test/utilities/tuple/tuple.tuple')
-rw-r--r--libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp
index b47842d419c..3fca5738929 100644
--- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp
+++ b/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp
@@ -213,4 +213,18 @@ int main()
assert(std::get<3>(t3) == 4);
assert(std::get<4>(t3) == 5);
}
+ {
+ // See bug #19616.
+ auto t1 = std::tuple_cat(
+ std::make_tuple(std::make_tuple(1)),
+ std::make_tuple()
+ );
+ assert(t1 == std::make_tuple(std::make_tuple(1)));
+
+ auto t2 = std::tuple_cat(
+ std::make_tuple(std::make_tuple(1)),
+ std::make_tuple(std::make_tuple(2))
+ );
+ assert(t2 == std::make_tuple(std::make_tuple(1), std::make_tuple(2)));
+ }
}
OpenPOWER on IntegriCloud