A few type casts, making the MS compiler silent.
This commit was SVN r20449.
Этот коммит содержится в:
родитель
7d2d6b16b1
Коммит
a20254c8a5
@ -601,7 +601,7 @@ static int do_modex(opal_list_t *procs)
|
|||||||
attr->size = num_bytes;
|
attr->size = num_bytes;
|
||||||
|
|
||||||
if (num_bytes != 0) {
|
if (num_bytes != 0) {
|
||||||
if (NULL == (attr->bytes = malloc(num_bytes))) {
|
if (NULL == (attr->bytes = (uint8_t *) malloc(num_bytes))) {
|
||||||
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
|
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
|
||||||
rc = ORTE_ERR_OUT_OF_RESOURCE;
|
rc = ORTE_ERR_OUT_OF_RESOURCE;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
@ -726,7 +726,7 @@ static int modex(opal_list_t *procs)
|
|||||||
nd = (orte_nid_t**)orte_nidmap.addr;
|
nd = (orte_nid_t**)orte_nidmap.addr;
|
||||||
while (0 < read(fd, &bo.size, sizeof(bo.size))) {
|
while (0 < read(fd, &bo.size, sizeof(bo.size))) {
|
||||||
/* this is the number of bytes in the byte object */
|
/* this is the number of bytes in the byte object */
|
||||||
bo.bytes = malloc(bo.size);
|
bo.bytes = (uint8_t *) malloc(bo.size);
|
||||||
if (0 > read(fd, bo.bytes, bo.size)) {
|
if (0 > read(fd, bo.bytes, bo.size)) {
|
||||||
orte_show_help("help-orte-runtime.txt", "orte_nidmap:unable-read-file", true, opal_profile_file);
|
orte_show_help("help-orte-runtime.txt", "orte_nidmap:unable-read-file", true, opal_profile_file);
|
||||||
close(fd);
|
close(fd);
|
||||||
@ -770,7 +770,7 @@ static int modex(opal_list_t *procs)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
/* unpack the bytes */
|
/* unpack the bytes */
|
||||||
attrdata->bytes = malloc(attrdata->size);
|
attrdata->bytes = (uint8_t *) malloc(attrdata->size);
|
||||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack(&bobuf, attrdata->bytes, &attrdata->size, OPAL_BYTE))) {
|
if (ORTE_SUCCESS != (rc = opal_dss.unpack(&bobuf, attrdata->bytes, &attrdata->size, OPAL_BYTE))) {
|
||||||
ORTE_ERROR_LOG(rc);
|
ORTE_ERROR_LOG(rc);
|
||||||
return rc;
|
return rc;
|
||||||
|
@ -1207,9 +1207,9 @@ void orte_plm_base_check_job_completed(orte_job_t *jdata)
|
|||||||
|
|
||||||
map = jdata->map;
|
map = jdata->map;
|
||||||
for( index = 0; index < map->num_nodes; index++ ) {
|
for( index = 0; index < map->num_nodes; index++ ) {
|
||||||
daemon = opal_pointer_array_get_item( map->nodes, index );
|
daemon = (orte_node_t *) opal_pointer_array_get_item( map->nodes, index );
|
||||||
for( i = 0; i < (int)daemon->num_procs; i++ ) {
|
for( i = 0; i < (int)daemon->num_procs; i++ ) {
|
||||||
proc = opal_pointer_array_get_item(daemon->procs, i);
|
proc = (orte_proc_t *) opal_pointer_array_get_item(daemon->procs, i);
|
||||||
if( (NULL != proc) && (proc->name.jobid == jdata->jobid) ) {
|
if( (NULL != proc) && (proc->name.jobid == jdata->jobid) ) {
|
||||||
daemon->slots_inuse--;
|
daemon->slots_inuse--;
|
||||||
}
|
}
|
||||||
|
@ -428,7 +428,7 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr)
|
|||||||
bptr = &bo;
|
bptr = &bo;
|
||||||
while (0 < read(fd, &bo.size, sizeof(bo.size))) {
|
while (0 < read(fd, &bo.size, sizeof(bo.size))) {
|
||||||
/* this is the number of bytes in the byte object */
|
/* this is the number of bytes in the byte object */
|
||||||
bo.bytes = malloc(bo.size);
|
bo.bytes = (uint8_t *) malloc(bo.size);
|
||||||
if (0 > read(fd, bo.bytes, bo.size)) {
|
if (0 > read(fd, bo.bytes, bo.size)) {
|
||||||
orte_show_help("help-orte-runtime.txt", "orte_nidmap:unable-read-file", true, opal_profile_file);
|
orte_show_help("help-orte-runtime.txt", "orte_nidmap:unable-read-file", true, opal_profile_file);
|
||||||
close(fd);
|
close(fd);
|
||||||
@ -742,7 +742,7 @@ process_daemons:
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
/* unpack the bytes */
|
/* unpack the bytes */
|
||||||
attrdata->bytes = malloc(attrdata->size);
|
attrdata->bytes = (uint8_t *) malloc(attrdata->size);
|
||||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack(&bobuf, attrdata->bytes, &attrdata->size, OPAL_BYTE))) {
|
if (ORTE_SUCCESS != (rc = opal_dss.unpack(&bobuf, attrdata->bytes, &attrdata->size, OPAL_BYTE))) {
|
||||||
ORTE_ERROR_LOG(rc);
|
ORTE_ERROR_LOG(rc);
|
||||||
return rc;
|
return rc;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user