From 2b81f42a76a58a23c358f6d72b65385c0073f94f Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 20 Oct 2016 20:54:32 +0000 Subject: Revert r284753 "[c++1z] Teach composite pointer type computation how to compute the composite" It caused PR30749. llvm-svn: 284778 --- clang/include/clang/Sema/Overload.h | 3 +-- clang/include/clang/Sema/Sema.h | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'clang/include') diff --git a/clang/include/clang/Sema/Overload.h b/clang/include/clang/Sema/Overload.h index f677afe8e26..83c6554c64d 100644 --- a/clang/include/clang/Sema/Overload.h +++ b/clang/include/clang/Sema/Overload.h @@ -145,8 +145,7 @@ namespace clang { /// pointer-to-member conversion, or boolean conversion. ImplicitConversionKind Second : 8; - /// Third - The third conversion can be a qualification conversion - /// or a function conversion. + /// Third - The third conversion can be a qualification conversion. ImplicitConversionKind Third : 8; /// \brief Whether this is the deprecated conversion of a diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 08e6a29ca11..1dd415d3497 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -8954,15 +8954,13 @@ public: ExprResult &cond, ExprResult &lhs, ExprResult &rhs, ExprValueKind &VK, ExprObjectKind &OK, SourceLocation questionLoc); QualType FindCompositePointerType(SourceLocation Loc, Expr *&E1, Expr *&E2, - bool *NonStandardCompositeType = nullptr, - bool ConvertArgs = true); + bool *NonStandardCompositeType = nullptr); QualType FindCompositePointerType(SourceLocation Loc, ExprResult &E1, ExprResult &E2, - bool *NonStandardCompositeType = nullptr, - bool ConvertArgs = true) { + bool *NonStandardCompositeType = nullptr) { Expr *E1Tmp = E1.get(), *E2Tmp = E2.get(); - QualType Composite = FindCompositePointerType( - Loc, E1Tmp, E2Tmp, NonStandardCompositeType, ConvertArgs); + QualType Composite = FindCompositePointerType(Loc, E1Tmp, E2Tmp, + NonStandardCompositeType); E1 = E1Tmp; E2 = E2Tmp; return Composite; -- cgit v1.2.3