diff options
Diffstat (limited to 'gdb/memrange.c')
| -rw-r--r-- | gdb/memrange.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdb/memrange.c b/gdb/memrange.c index e99f54e..339c6f0 100644 --- a/gdb/memrange.c +++ b/gdb/memrange.c @@ -19,6 +19,7 @@ #include "defs.h" #include "memrange.h" +#include <algorithm> int mem_ranges_overlap (CORE_ADDR start1, int len1, @@ -26,8 +27,8 @@ mem_ranges_overlap (CORE_ADDR start1, int len1, { ULONGEST h, l; - l = max (start1, start2); - h = min (start1 + len1, start2 + len2); + l = std::max (start1, start2); + h = std::min (start1 + len1, start2 + len2); return (l < h); } @@ -82,7 +83,7 @@ normalize_mem_ranges (VEC(mem_range_s) *ranges) merge them. */ if (rb->start <= ra->start + ra->length) { - ra->length = max (ra->length, + ra->length = std::max ((CORE_ADDR) ra->length, (rb->start - ra->start) + rb->length); continue; /* next b, same a */ } |