Cleanup warnings for improper use of C++ comment style, set ignores

This commit was SVN r27079.

ompi/mca/bcol/basesmuma/bcol_basesmuma.h

@@ -26,7 +26,6 @@
 
 #include "opal/mca/mca.h"
 #include "opal/util/arch.h"
-//#include "opal/mca/paffinity/base/base.h"
 #include "opal/util/argv.h"
 #include "opal/datatype/opal_datatype.h"
 #include "opal/util/output.h"

ompi/mca/bcol/basesmuma/bcol_basesmuma_module.c

@@ -28,7 +28,6 @@
 
 #include "opal/util/show_help.h"
 #include "opal/align.h"
-//#include "opal/mca/paffinity/base/base.h" 
 
 #include "bcol_basesmuma.h"
 #include "bcol_basesmuma_utils.h"

ompi/mca/coll/ml/coll_ml.h

@@ -34,11 +34,6 @@
 #include "coll_ml_allocation.h"
 #include "coll_ml_config.h"
 
-/* For using carto graphs */
-//#include "opal/mca/carto/carto.h"
-//#include "opal/mca/carto/base/base.h"
-/* end carto graphs */
-
 BEGIN_C_DECLS
 
 /* macros for return status */

ompi/mca/coll/ml/coll_ml_config.c

@@ -569,7 +569,6 @@ int mca_coll_ml_config_file_init(void)
 
     ret = parse_file(mca_coll_ml_component.config_file_name);
 
-    //return (OMPI_SUCCESS == ret || OMPI_ERR_NOT_FOUND == OPAL_SOS_GET_ERROR_CODE(ret)) ?
     return (OMPI_SUCCESS == ret ) ?
         OMPI_SUCCESS : ret;
 }

ompi/mca/coll/ml/coll_ml_module.c

@@ -38,7 +38,6 @@
 #include "orte/util/name_fns.h"
 #include "orte/mca/grpcomm/grpcomm.h"
 
-//#include "opal/mca/paffinity/base/base.h"
 #include "opal/util/argv.h"
 #include "opal/datatype/opal_datatype.h"
 #include "opal/util/output.h"
@@ -49,7 +48,6 @@
 #include "coll_ml_custom_utils.h"
 #include "coll_ml_allocation.h"
 
-//#include "coll_ml_resource_affinity.h"
 
 /* #define NEW_LEADER_SELECTION */
 
@@ -1995,7 +1993,6 @@ static int mca_coll_ml_tree_hierarchy_discovery(mca_coll_ml_module_t *ml_module,
     /*
     ** obtain list of procs
     */
-    //procs = ompi_comm_local_group_procs(ml_module->comm);
     procs = ml_module->comm->c_local_group->grp_proc_pointers;
 
     /* create private copy for manipulation */
@@ -2741,7 +2738,6 @@ static int mca_coll_ml_fill_in_route_tab(mca_coll_ml_topology_t *topo, ompi_comm
     }
 
     all_reachable_ranks[my_rank] = IS_RECHABLE;
-    //ompi_procs = ompi_comm_local_group_procs(comm);
     ompi_procs = comm->c_local_group->grp_proc_pointers;
 
     for (level = 0; level < topo->n_levels; ++level) {