[llvm-branch-commits] [cfe-branch] r114161 - in /cfe/branches/Apple/whitney-IB/src/tools/clang: ./ tools/libclang/CIndex.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Sep 16 22:37:42 2010
New Revision: 114161

URL: http://llvm.org/viewvc/llvm-project?rev=114161&view=rev
Log:
--- Merging r114075 into 'src/tools/clang':
U    src/tools/clang/tools/libclang/CIndex.cpp


Modified:
    cfe/branches/Apple/whitney-IB/src/tools/clang/   (props changed)
    cfe/branches/Apple/whitney-IB/src/tools/clang/tools/libclang/CIndex.cpp

Propchange: cfe/branches/Apple/whitney-IB/src/tools/clang/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 22:37:42 2010
@@ -1,2 +1,2 @@
-/cfe/trunk:114070
+/cfe/trunk:114070,114075
 /llvm/branches/Apple/Pertwee/tools/clang:110850,110961

Modified: cfe/branches/Apple/whitney-IB/src/tools/clang/tools/libclang/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/src/tools/clang/tools/libclang/CIndex.cpp?rev=114161&r1=114160&r2=114161&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/src/tools/clang/tools/libclang/CIndex.cpp (original)
+++ cfe/branches/Apple/whitney-IB/src/tools/clang/tools/libclang/CIndex.cpp Thu Sep 16 22:37:42 2010
@@ -3365,7 +3365,7 @@
 }
 
 unsigned clang_getNumOverloadedDecls(CXCursor C) {
-  if (!C.kind == CXCursor_OverloadedDeclRef)
+  if (C.kind != CXCursor_OverloadedDeclRef)
     return 0;
   
   OverloadedDeclRefStorage Storage = getCursorOverloadedDeclRef(C).first;
@@ -3388,7 +3388,7 @@
 }
 
 CXCursor clang_getOverloadedDecl(CXCursor cursor, unsigned index) {
-  if (!cursor.kind == CXCursor_OverloadedDeclRef)
+  if (cursor.kind != CXCursor_OverloadedDeclRef)
     return clang_getNullCursor();
 
   if (index >= clang_getNumOverloadedDecls(cursor))