summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaOverload.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2012-06-21 23:44:21 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2012-06-21 23:44:21 +0000
commitc368817101e04f8a932df91722c6fb72baff69b9 (patch)
treeadd533650b56241b8caa4db105ec10d54b8fa567 /clang/lib/Sema/SemaOverload.cpp
parentd93399a15d913e06d05c4e69a6613da607b071b0 (diff)
downloadbcm5719-llvm-c368817101e04f8a932df91722c6fb72baff69b9.tar.gz
bcm5719-llvm-c368817101e04f8a932df91722c6fb72baff69b9.zip
Revert r158887. This fixes pr13168.
Revert "If an object (such as a std::string) with an appropriate c_str() member function" This reverts commit 7d96f6106bfbd85b1af06f34fdbf2834aad0e47e. llvm-svn: 158949
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
-rw-r--r--clang/lib/Sema/SemaOverload.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 9a14cad72be..013af8a8f62 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -10720,7 +10720,7 @@ Sema::BuildCallToMemberFunction(Scope *S, Expr *MemExprE,
DiagnoseSentinelCalls(Method, LParenLoc, Args, NumArgs);
- if (CheckFunctionCall(Method, TheCall, Proto))
+ if (CheckFunctionCall(Method, TheCall))
return ExprError();
if ((isa<CXXConstructorDecl>(CurContext) ||
@@ -11028,7 +11028,7 @@ Sema::BuildCallToObjectOfClassType(Scope *S, Expr *Obj,
DiagnoseSentinelCalls(Method, LParenLoc, Args, NumArgs);
- if (CheckFunctionCall(Method, TheCall, Proto))
+ if (CheckFunctionCall(Method, TheCall))
return true;
return MaybeBindToTemporary(TheCall);
@@ -11208,7 +11208,7 @@ ExprResult Sema::BuildLiteralOperatorCall(LookupResult &R,
if (CheckCallReturnType(FD->getResultType(), UDSuffixLoc, UDL, FD))
return ExprError();
- if (CheckFunctionCall(FD, UDL, NULL))
+ if (CheckFunctionCall(FD, UDL))
return ExprError();
return MaybeBindToTemporary(UDL);
OpenPOWER on IntegriCloud