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/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index ba62be2..8b1c234 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -8532,12 +8532,10 @@
 
 Decl *Sema::ActOnUsingDeclaration(Scope *S,
                                   AccessSpecifier AS,
-                                  bool HasUsingKeyword,
                                   SourceLocation UsingLoc,
                                   CXXScopeSpec &SS,
                                   UnqualifiedId &Name,
                                   AttributeList *AttrList,
-                                  bool HasTypenameKeyword,
                                   SourceLocation TypenameLoc) {
   assert(S->getFlags() & Scope::DeclScope && "Invalid Scope.");
 
@@ -8579,7 +8577,7 @@
     return nullptr;
 
   // Warn about access declarations.
-  if (!HasUsingKeyword) {
+  if (UsingLoc.isInvalid()) {
     Diag(Name.getLocStart(),
          getLangOpts().CPlusPlus11 ? diag::err_access_decl
                                    : diag::warn_access_decl_deprecated)
@@ -8593,7 +8591,7 @@
   NamedDecl *UD = BuildUsingDeclaration(S, AS, UsingLoc, SS,
                                         TargetNameInfo, AttrList,
                                         /* IsInstantiation */ false,
-                                        HasTypenameKeyword, TypenameLoc);
+                                        TypenameLoc.isValid(), TypenameLoc);
   if (UD)
     PushOnScopeChains(UD, S, /*AddToContext*/ false);