[llvm-branch-commits] [llvm-branch] r127273 - in /llvm/branches/release_29: ./ lib/CodeGen/LiveInterval.cpp

[Bill Wendling]

Author: void
Date: Tue Mar  8 15:40:31 2011
New Revision: 127273

URL: http://llvm.org/viewvc/llvm-project?rev=127273&view=rev
Log:
Merge r127264:
Fix the build for MSVC 9 whose upper_bound() wants to compare elements in the
sorted array.

Patch by Olaf Krzikalla!

Modified:
    llvm/branches/release_29/   (props changed)
    llvm/branches/release_29/lib/CodeGen/LiveInterval.cpp

Propchange: llvm/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 15:40:31 2011
@@ -1 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
+/llvm/trunk:127264

Modified: llvm/branches/release_29/lib/CodeGen/LiveInterval.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/lib/CodeGen/LiveInterval.cpp?rev=127273&r1=127272&r2=127273&view=diff
==============================================================================
--- llvm/branches/release_29/lib/CodeGen/LiveInterval.cpp (original)
+++ llvm/branches/release_29/lib/CodeGen/LiveInterval.cpp Tue Mar  8 15:40:31 2011
@@ -39,6 +39,9 @@
   bool operator()(const LiveRange &A, SlotIndex B) const {
     return A.end < B;
   }
+  bool operator()(const LiveRange &A, const LiveRange &B) const {
+    return A.end < B.end;
+  }
 };
 }