[llvm-branch-commits] [cfe-branch] r105029 - /cfe/branches/Apple/whitney/tools/libclang/CIndexCodeCompletion.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri May 28 18:06:19 2010
New Revision: 105029

URL: http://llvm.org/viewvc/llvm-project?rev=105029&view=rev
Log:
Merge r104863:
--
Author: Bill Wendling <wendling at apple.com>
Date:   Thu May 27 18:35:05 2010 +0000

    Silence warning about "enumeral and non-enumeral type in conditional
    expression".

Modified:
    cfe/branches/Apple/whitney/tools/libclang/CIndexCodeCompletion.cpp

Modified: cfe/branches/Apple/whitney/tools/libclang/CIndexCodeCompletion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/tools/libclang/CIndexCodeCompletion.cpp?rev=105029&r1=105028&r2=105029&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/tools/libclang/CIndexCodeCompletion.cpp (original)
+++ cfe/branches/Apple/whitney/tools/libclang/CIndexCodeCompletion.cpp Fri May 28 18:06:19 2010
@@ -202,7 +202,7 @@
 unsigned clang_getCompletionPriority(CXCompletionString completion_string) {
   CXStoredCodeCompletionString *CCStr
     = (CXStoredCodeCompletionString *)completion_string;
-  return CCStr? CCStr->getPriority() : CCP_Unlikely;
+  return CCStr? CCStr->getPriority() : unsigned(CCP_Unlikely);
 }
   
 static bool ReadUnsigned(const char *&Memory, const char *MemoryEnd,