commit f97efd978bd7a72c598b30267ed58118f7a21c74
author NAKAMURA Takumi <geek4civic@gmail.com> Tue Dec 04 00:08:14 2012 +0000
committer NAKAMURA Takumi <geek4civic@gmail.com> Tue Dec 04 00:08:14 2012 +0000
tree 94068778951510123b8e61b420b9c25d55584179
parent 63e999edbf4b6215c5e89c055cc5f97fd6f4d51d

RuntimeDyld: Fix up r169178. MSVC doesn't like "or".

llvm-svn: 169183

llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
index cfeb2b4..a292ee1 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
@@ -168,7 +168,7 @@
   inline unsigned getMaxStubSize() {
     if (Arch == Triple::arm || Arch == Triple::thumb)
       return 8; // 32-bit instruction and 32-bit address
-    else if (Arch == Triple::mipsel or Arch == Triple::mips)
+    else if (Arch == Triple::mipsel || Arch == Triple::mips)
       return 16;
     else if (Arch == Triple::ppc64)
       return 44;