diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-17 22:13:23 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-17 22:13:23 +0000 |
commit | 94ff30c2f897207422084de3b3efd0396f7ecf8c (patch) | |
tree | a0b7f5deb0a4619d0694c9665c63b7187a1e8b2c /test | |
parent | fb3d70bc0f72e2033c101c72a26efdb5930414c2 (diff) | |
download | clang-94ff30c2f897207422084de3b3efd0396f7ecf8c.tar.gz |
[modules] Fix typo in default argument merging.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@239954 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r-- | test/Modules/Inputs/submodules-merge-defs/defs.h | 2 | ||||
-rw-r--r-- | test/Modules/Inputs/template-default-args/c.h | 1 | ||||
-rw-r--r-- | test/Modules/submodules-merge-defs.cpp | 1 | ||||
-rw-r--r-- | test/Modules/template-default-args.cpp | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/test/Modules/Inputs/submodules-merge-defs/defs.h b/test/Modules/Inputs/submodules-merge-defs/defs.h index 02a4ae946c..247b05c470 100644 --- a/test/Modules/Inputs/submodules-merge-defs/defs.h +++ b/test/Modules/Inputs/submodules-merge-defs/defs.h @@ -66,9 +66,11 @@ namespace FriendDefArg { template<typename = int> struct A; template<int = 0> struct B; template<template<typename> class = A> struct C; + template<typename = int, int = 0, template<typename> class = A> struct D {}; template<typename U> struct Y { template<typename> friend struct A; template<int> friend struct B; template<template<typename> class> friend struct C; + template<typename, int, template<typename> class> friend struct D; }; } diff --git a/test/Modules/Inputs/template-default-args/c.h b/test/Modules/Inputs/template-default-args/c.h index c204f31336..2946013b61 100644 --- a/test/Modules/Inputs/template-default-args/c.h +++ b/test/Modules/Inputs/template-default-args/c.h @@ -1 +1,2 @@ template<typename T = int> struct F; +template<typename T, typename U> struct I; diff --git a/test/Modules/submodules-merge-defs.cpp b/test/Modules/submodules-merge-defs.cpp index ee5e4fe1bf..38b3147ade 100644 --- a/test/Modules/submodules-merge-defs.cpp +++ b/test/Modules/submodules-merge-defs.cpp @@ -82,3 +82,4 @@ J<> post_j; template<typename T, int N, template<typename> class K> struct J; J<> post_j2; FriendDefArg::Y<int> friend_def_arg; +FriendDefArg::D<> friend_def_arg_d; diff --git a/test/Modules/template-default-args.cpp b/test/Modules/template-default-args.cpp index 9b2865421f..dc44534302 100644 --- a/test/Modules/template-default-args.cpp +++ b/test/Modules/template-default-args.cpp @@ -7,6 +7,7 @@ template<typename T> struct C; template<typename T = int> struct D; template<typename T = int> struct E {}; template<typename T> struct H {}; +template<typename T = int, typename U = int> struct I {}; #include "b.h" @@ -30,3 +31,4 @@ G<> g; // expected-error {{default argument of 'G' must be imported from module // expected-note@a.h:6 {{default argument declared here}} H<> h; // expected-error {{default argument of 'H' must be imported from module 'X.A' before it is required}} // expected-note@a.h:7 {{default argument declared here}} +I<> i; |