diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-11-12 00:03:40 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-11-12 00:03:40 +0000 |
commit | c998409cceb9a781cce489f2c82675724c69f62f (patch) | |
tree | 790dbb1d30159a4d0503daa9bf257091e8f89100 /clang/test/SemaTemplate/default-arguments.cpp | |
parent | 732ef8aefd67ac12f73c35c05280d1f82d342eb7 (diff) | |
download | bcm5719-llvm-c998409cceb9a781cce489f2c82675724c69f62f.tar.gz bcm5719-llvm-c998409cceb9a781cce489f2c82675724c69f62f.zip |
Remove an overly-eager assertion when replacing tokens with an
annotation token, because some of the tokens we're annotating might
not be in the set of cached tokens (we could have consumed them
unconditionally).
Also, move the tentative parsing from ParseTemplateTemplateArgument
into the one caller that needs it, improving recovery.
llvm-svn: 86904
Diffstat (limited to 'clang/test/SemaTemplate/default-arguments.cpp')
-rw-r--r-- | clang/test/SemaTemplate/default-arguments.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/test/SemaTemplate/default-arguments.cpp b/clang/test/SemaTemplate/default-arguments.cpp index e082693aa52..0247ddc0ef2 100644 --- a/clang/test/SemaTemplate/default-arguments.cpp +++ b/clang/test/SemaTemplate/default-arguments.cpp @@ -118,3 +118,6 @@ template<typename T, X6<int> x6a; X6<long> x6b; // expected-note{{while checking a default template argument}} X6<long, X5b> x6c; + + +template<template<class> class X = B<int> > struct X7; // expected-error{{must be a class template}} |