From: Douglas Gregor <dgregor@apple.com>
Date: Thu, 1 Apr 2010 22:47:07 +0000 (+0000)
Subject: Minor cleanup with the ternary operator
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1927b1f1d3194c1b9e7c3fa622542dd244f1a963;p=clang

Minor cleanup with the ternary operator

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@100144 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 8024af28d4..501c877c3d 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -2152,7 +2152,7 @@ QualType Sema::CXXCheckConditionalOperands(Expr *&Cond, Expr *&LHS, Expr *&RHS,
   // C++0x 5.16p4
   //   If the second and third operands are lvalues and have the same type,
   //   the result is of that type [...]
-  bool Same = Context.getCanonicalType(LTy) == Context.getCanonicalType(RTy);
+  bool Same = Context.hasSameType(LTy, RTy);
   if (Same && LHS->isLvalue(Context) == Expr::LV_Valid &&
       RHS->isLvalue(Context) == Expr::LV_Valid)
     return LTy;
@@ -2213,7 +2213,7 @@ QualType Sema::CXXCheckConditionalOperands(Expr *&Cond, Expr *&LHS, Expr *&RHS,
     return Composite;
   }
   
-  // Similarly, attempt to find composite type of twp objective-c pointers.
+  // Similarly, attempt to find composite type of two objective-c pointers.
   Composite = FindCompositeObjCPointerType(LHS, RHS, QuestionLoc);
   if (!Composite.isNull())
     return Composite;