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?


Begin forwarded message:

From: <rhc@osl.iu.edu>
Date: June 26, 2009 9:39:15 PM EDT
To: <svn-full@open-mpi.org>
Subject: [OMPI svn-full] svn:open-mpi r21552
Reply-To: <devel@open-mpi.org>

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

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 */
-<<<<<<< .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
             case MCA_BTL_SM_FRAG_ACK:
svn-full mailing list

Jeff Squyres
Cisco Systems