/* Memory ranges
- Copyright (C) 2010-2015 Free Software Foundation, Inc.
+ Copyright (C) 2010-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "defs.h"
#include "memrange.h"
+#include <algorithm>
int
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);
}
static int
compare_mem_ranges (const void *ap, const void *bp)
{
- const struct mem_range *r1 = ap;
- const struct mem_range *r2 = bp;
+ const struct mem_range *r1 = (const struct mem_range *) ap;
+ const struct mem_range *r2 = (const struct mem_range *) bp;
if (r1->start > r2->start)
return 1;
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 */
}