From: Sean Callanan <scallanan@apple.com>
Date: Sat, 12 Mar 2011 03:27:54 +0000 (+0000)
Subject: Fixed the comparison operator for the enhanced
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7a387e4d9de9ab8155836e65138621192ba8316a;p=oota-llvm.git

Fixed the comparison operator for the enhanced
disassembler's disassembler map.


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

diff --git a/lib/MC/MCDisassembler/EDDisassembler.h b/lib/MC/MCDisassembler/EDDisassembler.h
index 71e45f0b042..2fcc09d4bef 100644
--- a/lib/MC/MCDisassembler/EDDisassembler.h
+++ b/lib/MC/MCDisassembler/EDDisassembler.h
@@ -87,13 +87,8 @@ struct EDDisassembler {
     
     /// operator< - Less-than operator
     bool operator<(const CPUKey &key) const {
-      if(Arch > key.Arch)
-        return false;
-      else if (Arch == key.Arch) {
-        if(Syntax > key.Syntax)
-          return false;
-      }
-      return true;
+      return ((Arch < key.Arch) ||
+              ((Arch == key.Arch) && Syntax < (key.Syntax)));
     }
   };