From 7b43bdc984d36899c78ac56d8d021f89cbb0557f Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 18 Dec 2014 10:56:23 -0800 Subject: [PATCH] plm base: move flag inside the #if in which it is used Avoid a compiler warning by declaring the tflag only inside the #if in which it is used (i.e., if hwloc support is built). --- orte/mca/plm/base/plm_base_launch_support.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orte/mca/plm/base/plm_base_launch_support.c b/orte/mca/plm/base/plm_base_launch_support.c index ea3409bd86..43b6f616c4 100644 --- a/orte/mca/plm/base/plm_base_launch_support.c +++ b/orte/mca/plm/base/plm_base_launch_support.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 Institut National de Recherche en Informatique * et Automatique. All rights reserved. * Copyright (c) 2011-2012 Los Alamos National Security, LLC. @@ -687,7 +687,6 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender, orte_job_t *jdata; orte_process_name_t dname; opal_buffer_t *relay; - uint8_t tflag; /* get the daemon job, if necessary */ if (NULL == jdatorted) { @@ -845,6 +844,7 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender, orte_topology_t *t; int i; bool found; + uint8_t tflag; /* store the local resources for that node */ idx=1;