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).
Этот коммит содержится в:
родитель
140bb3d421
Коммит
7b43bdc984
@ -9,7 +9,7 @@
|
|||||||
* University of Stuttgart. All rights reserved.
|
* University of Stuttgart. All rights reserved.
|
||||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
* All rights reserved.
|
* 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
|
* Copyright (c) 2009 Institut National de Recherche en Informatique
|
||||||
* et Automatique. All rights reserved.
|
* et Automatique. All rights reserved.
|
||||||
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
|
* 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_job_t *jdata;
|
||||||
orte_process_name_t dname;
|
orte_process_name_t dname;
|
||||||
opal_buffer_t *relay;
|
opal_buffer_t *relay;
|
||||||
uint8_t tflag;
|
|
||||||
|
|
||||||
/* get the daemon job, if necessary */
|
/* get the daemon job, if necessary */
|
||||||
if (NULL == jdatorted) {
|
if (NULL == jdatorted) {
|
||||||
@ -845,6 +844,7 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender,
|
|||||||
orte_topology_t *t;
|
orte_topology_t *t;
|
||||||
int i;
|
int i;
|
||||||
bool found;
|
bool found;
|
||||||
|
uint8_t tflag;
|
||||||
|
|
||||||
/* store the local resources for that node */
|
/* store the local resources for that node */
|
||||||
idx=1;
|
idx=1;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user