From 1144084cb24ae53a120db47b1e77188247d7b583 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 26 Feb 2019 02:22:22 +0000 Subject: Revert r354832 "[ASTImporter] Add support for importing ChooseExpr AST nodes." Test does not pass on Windows llvm-svn: 354839 --- .../Inputs/class-template-partial-spec1.cpp | 118 --------------------- 1 file changed, 118 deletions(-) delete mode 100644 clang/test/ASTMerge/class-template-partial-spec/Inputs/class-template-partial-spec1.cpp (limited to 'clang/test/ASTMerge/class-template-partial-spec/Inputs/class-template-partial-spec1.cpp') diff --git a/clang/test/ASTMerge/class-template-partial-spec/Inputs/class-template-partial-spec1.cpp b/clang/test/ASTMerge/class-template-partial-spec/Inputs/class-template-partial-spec1.cpp deleted file mode 100644 index 43606d4d220..00000000000 --- a/clang/test/ASTMerge/class-template-partial-spec/Inputs/class-template-partial-spec1.cpp +++ /dev/null @@ -1,118 +0,0 @@ -template -struct TwoOptionTemplate {}; - -template -struct TwoOptionTemplate { - int member; -}; - - -template -struct TwoOptionTemplate { - float member; -}; - -template -struct TwoOptionTemplate { - T** member; -}; - -TwoOptionTemplate X0; -TwoOptionTemplate X1; -TwoOptionTemplate X2; -TwoOptionTemplate X3; -TwoOptionTemplate X4; -TwoOptionTemplate SingleSource; -TwoOptionTemplate SecondDoubleSource; - - -template -struct IntTemplateSpec {}; - -template -struct IntTemplateSpec<4, C> { - C member; -}; - -template -struct IntTemplateSpec { - int member; - static constexpr int val = I; -}; - -template -struct IntTemplateSpec { - char member; - static constexpr int val = I; -}; - -IntTemplateSpec<4, wchar_t> Y0; -IntTemplateSpec<5, void *> Y1; -IntTemplateSpec<1, long> Y2; -IntTemplateSpec<3, int> Y3; -//template constexpr int IntTemplateSpec::val; -IntTemplateSpec<42, double> NumberSource; -static_assert(NumberSource.val == 42); - -namespace One { -namespace Two { - // Just an empty namespace to ensure we can deal with multiple namespace decls. -} -} - - -namespace One { -namespace Two { -namespace Three { - -template -class Parent {}; - -} // namespace Three - -} // namespace Two - -template -struct Child1: public Two::Three::Parent { - char member; -}; - -template -struct Child1> { - T member; -}; - -} // namespace One - -One::Child1 Z0Source; - -// Test import of nested namespace specifiers -template -struct Outer { - template class Inner0; -}; - -template -template -class Outer::Inner0 { -public: - void f(X, Y); - template struct Inner1; -}; - -template -template -void Outer::Inner0::f(X, Y) {} - -template -template -template -class Outer::Inner0::Inner1 { -public: - void f(Y, Z); -}; - -template -template -template -void Outer::Inner0::Inner1::f(Y, Z) {} -- cgit v1.2.3