summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaTemplate/nested-name-spec-template.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-06-16 22:31:08 +0000
committerDouglas Gregor <dgregor@apple.com>2010-06-16 22:31:08 +0000
commitf7d77718123f89862cd761cf3bac4d5e80808e40 (patch)
tree1b58c3848efa8058bcbcdea774678aa475886535 /clang/test/SemaTemplate/nested-name-spec-template.cpp
parentd50c96a002f39ec9dba678acb391f7658201fd4c (diff)
downloadbcm5719-llvm-f7d77718123f89862cd761cf3bac4d5e80808e40.tar.gz
bcm5719-llvm-f7d77718123f89862cd761cf3bac4d5e80808e40.zip
Fix the recently-added warning about 'typename' and 'template'
disambiguation keywords outside of templates in C++98/03. Previously, the warning would fire when the associated nested-name-specifier was not dependent, but that was a misreading of the C++98/03 standard: now, we complain only when we're outside of any template. llvm-svn: 106161
Diffstat (limited to 'clang/test/SemaTemplate/nested-name-spec-template.cpp')
-rw-r--r--clang/test/SemaTemplate/nested-name-spec-template.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/SemaTemplate/nested-name-spec-template.cpp b/clang/test/SemaTemplate/nested-name-spec-template.cpp
index e542507a2f7..0251894f35a 100644
--- a/clang/test/SemaTemplate/nested-name-spec-template.cpp
+++ b/clang/test/SemaTemplate/nested-name-spec-template.cpp
@@ -21,7 +21,7 @@ namespace N {
}
M::Promote<int>::type *ret_intptr3(int* ip) { return ip; }
- M::template Promote<int>::type *ret_intptr4(int* ip) { return ip; } // expected-warning{{'template' refers to a non-dependent template name; accepted as a C++0x extension}}
+ M::template Promote<int>::type *ret_intptr4(int* ip) { return ip; } // expected-warning{{'template' keyword outside of a template}}
}
N::M::Promote<int>::type *ret_intptr5(int* ip) { return ip; }
OpenPOWER on IntegriCloud