summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorAlp Toker <alp@nuanti.com>2014-05-11 16:05:55 +0000
committerAlp Toker <alp@nuanti.com>2014-05-11 16:05:55 +0000
commit4284c6e7a4912c4603ab549065deaaf83ba96791 (patch)
tree505e062693cb2e16d2d3de4759c3f42f2b845afe /clang/lib/Sema/SemaDeclCXX.cpp
parent53156af57c35946caaa702cd387c0a5c07d8a5bd (diff)
downloadbcm5719-llvm-4284c6e7a4912c4603ab549065deaaf83ba96791.tar.gz
bcm5719-llvm-4284c6e7a4912c4603ab549065deaaf83ba96791.zip
Consolidate single void paramter checking
Also correct argument/parameter terminology. No change in functionality. llvm-svn: 208498
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 217588a9c09..ef4f8dd4e6a 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -6252,13 +6252,6 @@ bool Sema::CheckDestructor(CXXDestructorDecl *Destructor) {
return false;
}
-static inline bool
-FTIHasSingleVoidArgument(DeclaratorChunk::FunctionTypeInfo &FTI) {
- return (FTI.NumParams == 1 && !FTI.isVariadic && FTI.Params[0].Ident == 0 &&
- FTI.Params[0].Param &&
- cast<ParmVarDecl>(FTI.Params[0].Param)->getType()->isVoidType());
-}
-
/// CheckDestructorDeclarator - Called by ActOnDeclarator to check
/// the well-formednes of the destructor declarator @p D with type @p
/// R. If there are any errors in the declarator, this routine will
@@ -6337,7 +6330,7 @@ QualType Sema::CheckDestructorDeclarator(Declarator &D, QualType R,
}
// Make sure we don't have any parameters.
- if (FTI.NumParams > 0 && !FTIHasSingleVoidArgument(FTI)) {
+ if (FTIHasNonVoidParameters(FTI)) {
Diag(D.getIdentifierLoc(), diag::err_destructor_with_params);
// Delete the parameters.
OpenPOWER on IntegriCloud