[cfe-commits] r154613 - /cfe/trunk/lib/Sema/SemaOverload.cpp

[Douglas Gregor]

Author: dgregor
Date: Thu Apr 12 15:48:09 2012
New Revision: 154613

URL: http://llvm.org/viewvc/llvm-project?rev=154613&view=rev
Log:
s/isAtomicConversion/tryAtomicConversion/g, per Jordy's suggestion.

Modified:
    cfe/trunk/lib/Sema/SemaOverload.cpp

Modified: cfe/trunk/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=154613&r1=154612&r2=154613&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Thu Apr 12 15:48:09 2012
@@ -1294,10 +1294,10 @@
   return false;
 }
 
-static bool isAtomicConversion(Sema &S, Expr *From, QualType ToType,
-                               bool InOverloadResolution,
-                               StandardConversionSequence &SCS,
-                               bool CStyle);
+static bool tryAtomicConversion(Sema &S, Expr *From, QualType ToType,
+                                bool InOverloadResolution,
+                                StandardConversionSequence &SCS,
+                                bool CStyle);
   
 /// IsStandardConversion - Determines whether there is a standard
 /// conversion sequence (C++ [conv], C++ [over.ics.scs]) from the
@@ -1531,9 +1531,9 @@
                                              SCS, CStyle)) {
     SCS.Second = ICK_TransparentUnionConversion;
     FromType = ToType;
-  } else if (isAtomicConversion(S, From, ToType, InOverloadResolution, SCS,
-                                CStyle)) {
-    // isAtomicConversion has updated the standard conversion sequence 
+  } else if (tryAtomicConversion(S, From, ToType, InOverloadResolution, SCS,
+                                 CStyle)) {
+    // tryAtomicConversion has updated the standard conversion sequence
     // appropriately.
     return true;
   } else {
@@ -2779,10 +2779,10 @@
 ///
 /// If successful, updates \c SCS's second and third steps in the conversion
 /// sequence to finish the conversion.
-static bool isAtomicConversion(Sema &S, Expr *From, QualType ToType,
-                               bool InOverloadResolution,
-                               StandardConversionSequence &SCS,
-                               bool CStyle) {
+static bool tryAtomicConversion(Sema &S, Expr *From, QualType ToType,
+                                bool InOverloadResolution,
+                                StandardConversionSequence &SCS,
+                                bool CStyle) {
   const AtomicType *ToAtomic = ToType->getAs<AtomicType>();
   if (!ToAtomic)
     return false;