From 6d917fab89b17155b166b05c2011cfb4e0b3fe4b Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Tue, 10 Sep 2013 20:35:11 +0000 Subject: [PATCH] diff: use hwloc_uint64_t instead of uint64_t This commit was SVN r5808. --- include/hwloc/diff.h | 6 +++--- src/diff.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/hwloc/diff.h b/include/hwloc/diff.h index 6751cf8c..59f72965 100644 --- a/include/hwloc/diff.h +++ b/include/hwloc/diff.h @@ -81,9 +81,9 @@ union hwloc_topology_diff_obj_attr_u { struct hwloc_topology_diff_obj_attr_uint64_s { /* used for storing integer attributes */ hwloc_topology_diff_obj_attr_type_t type; - uint64_t index; /* not used for SIZE */ - uint64_t oldvalue; - uint64_t newvalue; + hwloc_uint64_t index; /* not used for SIZE */ + hwloc_uint64_t oldvalue; + hwloc_uint64_t newvalue; } uint64; /** \brief String attribute modification with an optional name */ diff --git a/src/diff.c b/src/diff.c index 5e327ca9..e076118e 100644 --- a/src/diff.c +++ b/src/diff.c @@ -97,9 +97,9 @@ static int hwloc_append_diff_obj_attr_string(hwloc_obj_t obj, static int hwloc_append_diff_obj_attr_uint64(hwloc_obj_t obj, hwloc_topology_diff_obj_attr_type_t type, - uint64_t index, - uint64_t oldvalue, - uint64_t newvalue, + hwloc_uint64_t index, + hwloc_uint64_t oldvalue, + hwloc_uint64_t newvalue, hwloc_topology_diff_t *firstdiffp, hwloc_topology_diff_t *lastdiffp) { @@ -314,9 +314,9 @@ hwloc_apply_diff_one(hwloc_topology_t topology, switch (obj_attr->diff.generic.type) { case HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_SIZE: { hwloc_obj_t tmpobj; - uint64_t oldvalue = reverse ? obj_attr->diff.uint64.newvalue : obj_attr->diff.uint64.oldvalue; - uint64_t newvalue = reverse ? obj_attr->diff.uint64.oldvalue : obj_attr->diff.uint64.newvalue; - uint64_t valuediff = newvalue - oldvalue; + hwloc_uint64_t oldvalue = reverse ? obj_attr->diff.uint64.newvalue : obj_attr->diff.uint64.oldvalue; + hwloc_uint64_t newvalue = reverse ? obj_attr->diff.uint64.oldvalue : obj_attr->diff.uint64.newvalue; + hwloc_uint64_t valuediff = newvalue - oldvalue; if (obj->memory.local_memory != oldvalue) return -1; obj->memory.local_memory = newvalue; -- 2.39.5