Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: [OMPI devel] Fwd: [OMPI svn-full] svn:open-mpi r21552
From: Jeff Squyres (jsquyres_at_[hidden])
Date: 2009-06-27 08:48:28


Just to make sure that George / Eugene sees this commit message...

There was a conflict committed in r21551. Can someone check these
compiler warning messages?

Thanks.

Begin forwarded message:

> From: <rhc_at_[hidden]>
> Date: June 26, 2009 9:39:15 PM EDT
> To: <svn-full_at_[hidden]>
> Subject: [OMPI svn-full] svn:open-mpi r21552
> Reply-To: <devel_at_[hidden]>
>
> Author: rhc
> Date: 2009-06-26 21:39:15 EDT (Fri, 26 Jun 2009)
> New Revision: 21552
> URL: https://svn.open-mpi.org/trac/ompi/changeset/21552
>
> Log:
> Remove svn conflict lines due to commit r21551 in the sm btl. I #if
> 0'd out the offending line that cause the conflict just in case it
> was the correct one. However, this now compiles cleanly, minus the
> following warnings that I wasn't sure which way to resolve:
>
> btl_sm.c: In function ‘mca_btl_sm_sendi’:
> btl_sm.c:734: warning: comparison between signed and unsigned
> btl_sm.c: In function ‘mca_btl_sm_send’:
> btl_sm.c:812: warning: comparison between signed and unsigned
>
>
> Text files modified:
> trunk/ompi/mca/btl/sm/btl_sm_component.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> Modified: trunk/ompi/mca/btl/sm/btl_sm_component.c
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/ompi/mca/btl/sm/btl_sm_component.c (original)
> +++ trunk/ompi/mca/btl/sm/btl_sm_component.c 2009-06-26 21:39:15
> EDT (Fri, 26 Jun 2009)
> @@ -428,11 +428,10 @@
> /* return the fragment */
> MCA_BTL_SM_FIFO_WRITE(
> mca_btl_sm_component.sm_peers[peer_smp_rank],
> -<<<<<<< .mine
> my_smp_rank, peer_smp_rank, hdr->frag,
> false, true, rc);
> -=======
> +#if 0
> my_smp_rank, peer_smp_rank, hdr->frag,
> false, rc);
> ->>>>>>> .r21550
> +#endif
> break;
> }
> case MCA_BTL_SM_FRAG_ACK:
> _______________________________________________
> svn-full mailing list
> svn-full_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/svn-full
>

-- 
Jeff Squyres
Cisco Systems