Author: alexfh Date: Wed Mar 23 09:28:52 2016 New Revision: 264158 URL: http://llvm.org/viewvc/llvm-project?rev=264158&view=rev Log: Use an enum instead of hardcoded indices. NFC.
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp Modified: cfe/trunk/lib/Sema/SemaDecl.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=264158&r1=264157&r2=264158&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaDecl.cpp (original) +++ cfe/trunk/lib/Sema/SemaDecl.cpp Wed Mar 23 09:28:52 2016 @@ -6423,16 +6423,20 @@ void Sema::CheckShadow(Scope *S, VarDecl } // Determine what kind of declaration we're shadowing. - unsigned Kind; + + // The order must be consistent with the %select in the warning message. + enum ShadowedDeclKind { Local, Global, StaticMember, Field }; + ShadowedDeclKind Kind; if (isa<RecordDecl>(OldDC)) { if (isa<FieldDecl>(ShadowedDecl)) - Kind = 3; // field + Kind = Field; else - Kind = 2; // static data member - } else if (OldDC->isFileContext()) - Kind = 1; // global - else - Kind = 0; // local + Kind = StaticMember; + } else if (OldDC->isFileContext()) { + Kind = Global; + } else { + Kind = Local; + } DeclarationName Name = R.getLookupName(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits