remove another old-school Diag method.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59712 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index bf160ac..743f6a8 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -576,15 +576,15 @@
} else {
// not const integral.
- Diag(Loc, diag::err_member_initialization,
- Name.getAsString(), Init->getSourceRange());
+ Diag(Loc, diag::err_member_initialization)
+ << Name.getAsString() << Init->getSourceRange();
InvalidDecl = true;
}
} else {
// not static member.
- Diag(Loc, diag::err_member_initialization,
- Name.getAsString(), Init->getSourceRange());
+ Diag(Loc, diag::err_member_initialization)
+ << Name.getAsString() << Init->getSourceRange();
InvalidDecl = true;
}
}
@@ -1442,18 +1442,16 @@
case OR_No_Viable_Function:
if (CandidateSet.empty())
- Diag(Loc, diag::err_ovl_no_viable_function_in_init,
- InitEntity, Range);
+ Diag(Loc, diag::err_ovl_no_viable_function_in_init) << InitEntity, Range;
else {
- Diag(Loc, diag::err_ovl_no_viable_function_in_init_with_cands,
- InitEntity, Range);
+ Diag(Loc, diag::err_ovl_no_viable_function_in_init_with_cands)
+ << InitEntity << Range;
PrintOverloadCandidates(CandidateSet, /*OnlyViable=*/false);
}
return 0;
case OR_Ambiguous:
- Diag(Loc, diag::err_ovl_ambiguous_init,
- InitEntity, Range);
+ Diag(Loc, diag::err_ovl_ambiguous_init) << InitEntity << Range;
PrintOverloadCandidates(CandidateSet, /*OnlyViable=*/true);
return 0;
}
@@ -1848,8 +1846,8 @@
Param != FnDecl->param_end(); ++Param) {
if (Expr *DefArg = (*Param)->getDefaultArg())
return Diag((*Param)->getLocation(),
- diag::err_operator_overload_default_arg,
- FnDecl->getName(), DefArg->getSourceRange());
+ diag::err_operator_overload_default_arg)
+ << FnDecl->getName() << DefArg->getSourceRange();
}
}