Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

From: Jeff Squyres (jsquyres_at_[hidden])
Date: 2005-11-27 07:43:57


George --

What compiler(s) did this create a problem on? Does it need to go to
v1.0?

On Nov 26, 2005, at 4:18 PM, bosilca_at_[hidden] wrote:

> Author: bosilca
> Date: 2005-11-26 16:18:47 -0500 (Sat, 26 Nov 2005)
> New Revision: 8262
>
> Modified:
> trunk/opal/runtime/opal_init.c
> Log:
> error seems to be a reserved keyword for some compilers ...
>
>
> Modified: trunk/opal/runtime/opal_init.c
> ===================================================================
> --- trunk/opal/runtime/opal_init.c 2005-11-26 21:17:15 UTC (rev 8261)
> +++ trunk/opal/runtime/opal_init.c 2005-11-26 21:18:47 UTC (rev 8262)
> @@ -89,13 +89,13 @@
> if (OPAL_SUCCESS != (ret = opal_error_register("OPAL",
> OPAL_ERR_BASE, OPAL_ERR_MAX, opal_err2str))) {
> error = "opal_error_register";
> - goto error;
> + goto return_error;
> }
>
> /* initialize the mca */
> if (OMPI_SUCCESS != (ret = mca_base_open())) {
> error = "mca_base_open";
> - goto error;
> + goto return_error;
> }
>
> /* open the processor affinity base */
> @@ -108,27 +108,25 @@
> without good initialization routine support */
> if (OPAL_SUCCESS != (ret = opal_memory_base_open())) {
> error = "opal_memory_base_open";
> - goto error;
> + goto return_error;
> }
>
> /* initialize the memory manager / tracker */
> if (OPAL_SUCCESS != opal_mem_free_init()) {
> error = "opal_mem_free_init";
> - goto error;
> + goto return_error;
> }
>
> if (OPAL_SUCCESS != (ret = opal_timer_base_open())) {
> error = "opal_timer_base_open";
> - goto error;
> + goto return_error;
> }
> + return OPAL_SUCCESS;
>
> -error:
> - if (ret != OPAL_SUCCESS) {
> - opal_show_help("help-opal-runtime",
> - "opal_init:startup:internal-failure", true,
> - error, ret);
> - }
> -
> + return_error:
> + opal_show_help( "help-opal-runtime",
> + "opal_init:startup:internal-failure", true,
> + error, ret );
> return ret;
> }
>
>
> _______________________________________________
> svn-full mailing list
> svn-full_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/svn-full
>

-- 
{+} Jeff Squyres
{+} The Open MPI Project
{+} http://www.open-mpi.org/