- Silence compiler on ORTE_TRANSPORT_KEY_FMT, it is fixed to llx
- No functional changes, just indentation and corrections to error output. This commit was SVN r12734.
Этот коммит содержится в:
родитель
30ca7457b4
Коммит
e61dd8722e
@ -167,7 +167,7 @@ opal_init_util(void)
|
|||||||
|
|
||||||
/* pretty-print stack handlers */
|
/* pretty-print stack handlers */
|
||||||
if (OPAL_SUCCESS != (ret = opal_util_register_stackhandlers())) {
|
if (OPAL_SUCCESS != (ret = opal_util_register_stackhandlers())) {
|
||||||
error = "util_register_stackhandlers() failed";
|
error = "opal_util_register_stackhandlers";
|
||||||
goto return_error;
|
goto return_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -222,7 +222,7 @@ opal_init(void)
|
|||||||
|
|
||||||
/* initialize the memory manager / tracker */
|
/* initialize the memory manager / tracker */
|
||||||
if (OPAL_SUCCESS != opal_mem_hooks_init()) {
|
if (OPAL_SUCCESS != opal_mem_hooks_init()) {
|
||||||
error = "opal_mem_free_init";
|
error = "opal_mem_hooks_init";
|
||||||
goto return_error;
|
goto return_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -488,7 +488,7 @@ MOVEON:
|
|||||||
OPAL_THREAD_UNLOCK(&orte_setup_hnp_mutex);
|
OPAL_THREAD_UNLOCK(&orte_setup_hnp_mutex);
|
||||||
|
|
||||||
if (ORTE_SUCCESS == orte_setup_hnp_rc) {
|
if (ORTE_SUCCESS == orte_setup_hnp_rc) {
|
||||||
/* Remember if we were infrastructre or not */
|
/* Remember if we were infrastructure or not */
|
||||||
id = mca_base_param_find("orte", NULL, "infrastructure");
|
id = mca_base_param_find("orte", NULL, "infrastructure");
|
||||||
mca_base_param_lookup_int(id, &intparam);
|
mca_base_param_lookup_int(id, &intparam);
|
||||||
if ( ((int)true) != intparam) {
|
if ( ((int)true) != intparam) {
|
||||||
|
@ -100,8 +100,8 @@ int orte_pre_condition_transports(orte_app_context_t **app_context, size_t num_c
|
|||||||
}
|
}
|
||||||
#endif /* !defined(__WINDOWS__) */
|
#endif /* !defined(__WINDOWS__) */
|
||||||
|
|
||||||
sprintf(string_key, ORTE_TRANSPORT_KEY_FMT, (long unsigned)unique_key[0],
|
sprintf(string_key, ORTE_TRANSPORT_KEY_FMT, (long long unsigned)unique_key[0],
|
||||||
(long unsigned)unique_key[1]);
|
(long long unsigned)unique_key[1]);
|
||||||
string_key[sizeof string_key - 1] = '\0';
|
string_key[sizeof string_key - 1] = '\0';
|
||||||
|
|
||||||
if (NULL == (cs_env = mca_base_param_environ_variable("orte_precondition_transports",NULL,NULL))) {
|
if (NULL == (cs_env = mca_base_param_environ_variable("orte_precondition_transports",NULL,NULL))) {
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user