commit 6f1daa4660edb7f401c67b3e23d213bce103bca9
author Richard Smith <richard-llvm@metafoo.co.uk> Fri Dec 16 00:58:48 2016 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Fri Dec 16 00:58:48 2016 +0000
tree 057de1816c4f9ccf8505c923123a4c35f64f60e0
parent 53f14c78b5d580c777ccd75a22f8b57cf76efa48

[c++1z] P0195R2: Allow multiple using-declarators in a single using-declaration.

llvm-svn: 289905

clang/lib/Parse/ParseTemplate.cpp

diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index 1f54376..6a09ea7 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/lib/Parse/ParseTemplate.cpp
@@ -196,9 +196,12 @@
   ParsedAttributesWithRange prefixAttrs(AttrFactory);
   MaybeParseCXX11Attributes(prefixAttrs);
 
-  if (Tok.is(tok::kw_using))
-    return ParseUsingDirectiveOrDeclaration(Context, TemplateInfo, DeclEnd,
-                                            prefixAttrs);
+  if (Tok.is(tok::kw_using)) {
+    // FIXME: We should return the DeclGroup to the caller.
+    ParseUsingDirectiveOrDeclaration(Context, TemplateInfo, DeclEnd,
+                                     prefixAttrs);
+    return nullptr;
+  }
 
   // Parse the declaration specifiers, stealing any diagnostics from
   // the template parameters.