minor cleanup

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

ompi/attribute/attribute.c

@@ -322,7 +322,6 @@ do { \
     /* C style */ \
     else { \
         void *attr_val = translate_to_c(attribute); \
-        /* TODO: NEED SUPPORT FOR ABI */ \
         err = (*((keyval_obj->delete_attr_fn).attr_##type##_delete_fn)) \
             ((ompi_##type##_t *)object,                                 \
              key, attr_val,                                             \
@@ -382,7 +381,6 @@ do { \
     else { \
         void *in, *out; \
         in = translate_to_c(in_attr); \
-        /* TODO: NEED SUPPORT FOR ABI */ \
         if ((err = (*((keyval_obj->copy_attr_fn).attr_##type##_copy_fn)) \
               ((ompi_##type##_t *)old_object, key, keyval_obj->extra_state.c_ptr, \
                in, &out, &flag)) == MPI_SUCCESS) { \

ompi/attribute/attribute.h

@@ -50,7 +50,6 @@
 #define OMPI_KEYVAL_PREDEFINED     0x0001
 #define OMPI_KEYVAL_F77            0x0002
 #define OMPI_KEYVAL_F77_INT        0x0004
-#define OMPI_KEYVAL_ABI            0x0008
 
 
 BEGIN_C_DECLS
@@ -137,7 +136,7 @@ struct ompi_attribute_keyval_t {
                                        copy/delete attribute functions
                                        properly and error checking */
     int attr_flag; /**< flag field: contains "OMPI_KEYVAL_PREDEFINED",
-                      "OMPI_KEYVAL_F77", "OMPI_KEYVAL_ABI", etc.  */
+                      "OMPI_KEYVAL_F77", etc.  */
     ompi_attribute_fn_ptr_union_t copy_attr_fn; /**< Copy function for the
                                              attribute */
     ompi_attribute_fn_ptr_union_t delete_attr_fn; /**< Delete function for the

ompi/mca/hook/comm_method/hook_comm_method_fns.c

@@ -511,7 +511,6 @@ ompi_report_comm_methods(int called_from_location)
         free(p);
     }
 
-#if 0
     MPI_Datatype mydt;
     MPI_Op myop;
     MPI_Type_contiguous(sizeof(comm_method_string_conversion_t), MPI_BYTE, &mydt);
@@ -522,7 +521,6 @@ ompi_report_comm_methods(int called_from_location)
             leader_comm->c_coll->coll_allreduce_module);
     MPI_Op_free(&myop);
     MPI_Type_free(&mydt);
-#endif
 
     // Sort communication method string arrays after reduction
     qsort(&comm_method_string_conversion.str[1],