No vestiges of the RTE or OMPI left.

This commit was SVN r32327.

opal/mca/btl/usnic/btl_usnic_cagent.c

@@ -24,10 +24,6 @@
 #include "opal/util/output.h"
 #include "opal/util/fd.h"
 
-#include "ompi/mca/rte/rte.h"
-#include "ompi/runtime/mpiruntime.h"
-#include "ompi/constants.h"
-
 #include "btl_usnic.h"
 #include "btl_usnic_connectivity.h"
 

opal/mca/btl/usnic/btl_usnic_cclient.c

@@ -26,8 +26,6 @@
 #include "opal/util/output.h"
 #include "opal/util/fd.h"
 
-#include "ompi/mca/rte/rte.h"
-
 #include "btl_usnic.h"
 #include "btl_usnic_module.h"
 #include "btl_usnic_connectivity.h"

opal/mca/btl/usnic/btl_usnic_module.c

@@ -41,7 +41,6 @@
 #include "opal/mca/btl/base/btl_base_error.h"
 #include "opal/mca/mpool/base/base.h"
 #include "opal/mca/mpool/mpool.h"
-#include "ompi/memchecker.h"
 
 #include "btl_usnic.h"
 #include "btl_usnic_connectivity.h"

opal/mca/btl/usnic/btl_usnic_proc.c

@@ -692,7 +692,7 @@ opal_btl_usnic_create_endpoint(opal_btl_usnic_module_t *module,
     proc->proc_modex_claimed[modex_index] = true;
     MSGDEBUG1_OUT("create_endpoint: module=%p claimed endpoint=%p on proc=%p (hash=0x%" PRIx64 ")\n",
                   (void *)module, (void *)endpoint, (void *)proc,
-                  ompi_rte_hash_name(&proc->proc_opal->proc_name));
+                  proc->proc_opal->proc_name);
 
     /* Save the endpoint on this proc's array of endpoints */
     proc->proc_endpoints[proc->proc_endpoint_count] = endpoint;