Ralph Castain ee18838e2f 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

This commit was SVN r21552.

The following SVN revision numbers were found above:
  r21551 --> open-mpi/ompi@bd995d26b4

2009-06-27 01:39:15 +00:00

..

attribute

- As discussed revert r21330, Fortran-configure info should

2009-06-01 19:02:34 +00:00

class

This is a very large change to rename several #define values from

2009-05-06 20:11:28 +00:00

communicator

- As discussed revert r21330, Fortran-configure info should

2009-06-01 19:02:34 +00:00

contrib/vt

Fixed detection of Sun Studio compiler on Linux for automatic instrumentation

2009-06-25 11:11:41 +00:00

datatype

- As discussed revert r21330, Fortran-configure info should

2009-06-01 19:02:34 +00:00

debuggers

This commit fixes trac:1931. By separating out structures and defines used by

2009-06-10 14:57:28 +00:00

errhandler

- As discussed revert r21330, Fortran-configure info should

2009-06-01 19:02:34 +00:00

etc

Many thanks to Ralf W. for finding a subtle bug in these Makefile.am's

2008-06-04 01:28:03 +00:00

file

- As discussed revert r21330, Fortran-configure info should

2009-06-01 19:02:34 +00:00

group

Revert the prior change out from the individual .h files - the problem was in the Makefile.am's, causing the make dist to fail.

2009-06-11 03:15:47 +00:00

include

Get rid of a bunch of compiler warnings on Windows.

2009-06-26 07:51:39 +00:00

info

- As discussed revert r21330, Fortran-configure info should

2009-06-01 19:02:34 +00:00

mca

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:

2009-06-27 01:39:15 +00:00

mpi

Per the discussion yesterday, remove all use of MPI_Flogical -- it's

2009-06-02 12:04:17 +00:00

mpiext

Per RFC: MPI Interface Extensions Infrastructure

2009-05-26 20:49:35 +00:00

op

Added padding to predefined handle structures to maintain library version to

2009-02-24 17:17:33 +00:00

peruse

... Delayed due to notifier commits earlier this day ...

2009-04-29 01:32:14 +00:00

proc

This is a very large change to rename several #define values from

2009-05-06 20:11:28 +00:00

request

Revert the prior change out from the individual .h files - the problem was in the Makefile.am's, causing the make dist to fail.

2009-06-11 03:15:47 +00:00

runtime

Make the match for the "env" option to mpi_show_mca_params to be less strict - match it if the string at least starts with "env" so "enviro" and "environ" all match.

2009-06-19 03:43:53 +00:00

tools

- As discussed revert r21330, Fortran-configure info should

2009-06-01 19:02:34 +00:00

win

- As discussed revert r21330, Fortran-configure info should

2009-06-01 19:02:34 +00:00

CMakeLists.txt

Add the generated mpi_portable_platform.h into the install file list.

2009-05-27 12:16:36 +00:00

Makefile.am

Per RFC: MPI Interface Extensions Infrastructure

2009-05-26 20:49:35 +00:00