diff options
Diffstat (limited to 'clang/test/Modules/Inputs')
-rw-r--r-- | clang/test/Modules/Inputs/redecl-merge-left.h | 6 | ||||
-rw-r--r-- | clang/test/Modules/Inputs/redecl-merge-right.h | 6 | ||||
-rw-r--r-- | clang/test/Modules/Inputs/redecl-merge-top.h | 5 |
3 files changed, 17 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/redecl-merge-left.h b/clang/test/Modules/Inputs/redecl-merge-left.h index b3a7ba83c1a..4bdd01570f6 100644 --- a/clang/test/Modules/Inputs/redecl-merge-left.h +++ b/clang/test/Modules/Inputs/redecl-merge-left.h @@ -82,6 +82,12 @@ extern double var3; template<typename T> class Vector; template<typename T> class Vector; + +template<typename T> class List; +template<> class List<bool> { +public: + void push_back(int); +}; #endif // Make sure this doesn't introduce an ambiguity-creating 'id' at the diff --git a/clang/test/Modules/Inputs/redecl-merge-right.h b/clang/test/Modules/Inputs/redecl-merge-right.h index de7aa08cfb2..695327674fb 100644 --- a/clang/test/Modules/Inputs/redecl-merge-right.h +++ b/clang/test/Modules/Inputs/redecl-merge-right.h @@ -83,6 +83,12 @@ template<typename T> class Vector { public: void push_back(const T&); }; + +template<typename T> class List; +template<> class List<bool> { +public: + void push_back(int); +}; #endif int ONE; diff --git a/clang/test/Modules/Inputs/redecl-merge-top.h b/clang/test/Modules/Inputs/redecl-merge-top.h index 519254ca221..7053936b2cc 100644 --- a/clang/test/Modules/Inputs/redecl-merge-top.h +++ b/clang/test/Modules/Inputs/redecl-merge-top.h @@ -17,4 +17,9 @@ struct S2; #ifdef __cplusplus template<typename T> class Vector; + +template<typename T> class List { +public: + void push_back(T); +}; #endif |