Open MPI logo

Hardware Locality Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Hardware Locality Development mailing list

Subject: Re: [hwloc-devel] [hwloc-svn] svn:hwloc r1988
From: Jeff Squyres (jsquyres_at_[hidden])
Date: 2010-04-21 12:25:50


Perfect; this is better than my solution. Thanks!

On Apr 21, 2010, at 12:22 PM, <sthibaul_at_[hidden]> wrote:

> Author: sthibaul
> Date: 2010-04-21 12:22:39 EDT (Wed, 21 Apr 2010)
> New Revision: 1988
> URL: https://svn.open-mpi.org/trac/hwloc/changeset/1988
>
> Log:
> __typeof__ is not c99
> Text files modified:
> trunk/src/topology.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> Modified: trunk/src/topology.c
> ==============================================================================
> --- trunk/src/topology.c (original)
> +++ trunk/src/topology.c 2010-04-21 12:22:39 EDT (Wed, 21 Apr 2010)
> @@ -648,8 +648,8 @@
> * complete.
> */
>
> -#define merge_index(new, old, field) \
> - if ((old)->field == (__typeof__((old)->field)) -1) \
> +#define merge_index(new, old, field, type) \
> + if ((old)->field == (type) -1) \
> (old)->field = (new)->field;
> #define merge_sizes(new, old, field) \
> if (!(old)->field) \
> @@ -680,12 +680,12 @@
> for (child = cur->first_child; child; child = child->next_sibling) {
> switch (hwloc_obj_cmp(obj, child)) {
> case HWLOC_OBJ_EQUAL:
> - merge_index(obj, child, os_level);
> + merge_index(obj, child, os_level, signed);
> if (obj->os_level != child->os_level) {
> fprintf(stderr, "Different OS level\n");
> return;
> }
> - merge_index(obj, child, os_index);
> + merge_index(obj, child, os_index, unsigned);
> if (obj->os_index != child->os_index) {
> fprintf(stderr, "Different OS indexes\n");
> return;
> _______________________________________________
> hwloc-svn mailing list
> hwloc-svn_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-svn
>

-- 
Jeff Squyres
jsquyres_at_[hidden]
For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/