diff options
| -rw-r--r-- | lib/AST/TypePrinter.cpp | 2 | ||||
| -rw-r--r-- | test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp | 2 | ||||
| -rw-r--r-- | test/SemaTemplate/class-template-id.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/AST/TypePrinter.cpp b/lib/AST/TypePrinter.cpp index f33c5ae882..9e7f1309d4 100644 --- a/lib/AST/TypePrinter.cpp +++ b/lib/AST/TypePrinter.cpp @@ -74,7 +74,7 @@ void TypePrinter::Print(QualType T, std::string &S) { // type expands to a simple string. bool CanPrefixQualifiers = isa<BuiltinType>(T) || isa<TypedefType>(T) || isa<TagType>(T) || - isa<ComplexType>(T); + isa<ComplexType>(T) || isa<TemplateSpecializationType>(T); if (!CanPrefixQualifiers && !Quals.empty()) { std::string TQS; diff --git a/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp b/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp index df3429ef31..1e5a823663 100644 --- a/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp +++ b/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp @@ -44,7 +44,7 @@ namespace Test { // PR6716 namespace test1 { template <class T> class A { - template <class U> friend void foo(A &, U); // expected-note {{not viable: 1st argument ('A<int> const') would lose const qualifier}} + template <class U> friend void foo(A &, U); // expected-note {{not viable: 1st argument ('const A<int>') would lose const qualifier}} }; void test() { diff --git a/test/SemaTemplate/class-template-id.cpp b/test/SemaTemplate/class-template-id.cpp index 50e0b00c1a..3b02778724 100644 --- a/test/SemaTemplate/class-template-id.cpp +++ b/test/SemaTemplate/class-template-id.cpp @@ -9,7 +9,7 @@ A<int, FLOAT> *foo(A<int> *ptr, A<int> const *ptr2, A<int, double> *ptr3) { if (ptr) return ptr; // okay else if (ptr2) - return ptr2; // expected-error{{cannot initialize return object of type 'A<int, FLOAT> *' with an lvalue of type 'A<int> const *'}} + return ptr2; // expected-error{{cannot initialize return object of type 'A<int, FLOAT> *' with an lvalue of type 'const A<int> *'}} else { return ptr3; // expected-error{{cannot initialize return object of type 'A<int, FLOAT> *' with an lvalue of type 'A<int, double> *'}} } |