From 9f73335bdb0f55e28b9ba961af6085a628e166a2 Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Wed, 31 Jan 2007 04:24:56 +0000
Subject: [PATCH] Silence the compiler.

This commit was SVN r13381.
---
 orte/dss/dss_pack.c                                        | 3 ++-
 orte/dss/dss_unpack.c                                      | 3 ++-
 .../api_layer/gpr_replica_dump_local_trigs_subs_api.c      | 7 ++++---
 orte/mca/oob/base/oob_base_xcast.c                         | 1 -
 orte/mca/oob/tcp/oob_tcp_peer.c                            | 2 +-
 orte/tools/orterun/orterun.c                               | 3 ++-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/orte/dss/dss_pack.c b/orte/dss/dss_pack.c
index 2fc5c8d0fc..69cb3bec2d 100644
--- a/orte/dss/dss_pack.c
+++ b/orte/dss/dss_pack.c
@@ -67,7 +67,8 @@ int orte_dss_pack_buffer(orte_buffer_t *buffer, void *src, orte_std_cntr_t num_v
     int rc;
     orte_dss_type_info_t *info;
 
-    OPAL_OUTPUT( ( orte_dss_verbose, "orte_dss_pack_buffer( %p, %p, %lu, %d )\n", buffer, src, num_vals, (int)type ) );
+    OPAL_OUTPUT( ( orte_dss_verbose, "orte_dss_pack_buffer( %p, %p, %lu, %d )\n",
+                   (void*)buffer, src, (long unsigned int)num_vals, (int)type ) );
 
     /* Pack the declared data type */
     if (ORTE_DSS_BUFFER_FULLY_DESC == buffer->type) {
diff --git a/orte/dss/dss_unpack.c b/orte/dss/dss_unpack.c
index 9e206d6f33..96dbb3a732 100644
--- a/orte/dss/dss_unpack.c
+++ b/orte/dss/dss_unpack.c
@@ -111,7 +111,8 @@ int orte_dss_unpack_buffer(orte_buffer_t *buffer, void *dst, orte_std_cntr_t *nu
     orte_data_type_t local_type;
     orte_dss_type_info_t *info;
 
-    OPAL_OUTPUT( ( orte_dss_verbose, "orte_dss_unpack_buffer( %p, %p, %lu, %d )\n", buffer, dst, *num_vals, (int)type ) );
+    OPAL_OUTPUT( ( orte_dss_verbose, "orte_dss_unpack_buffer( %p, %p, %lu, %d )\n",
+                   (void*)buffer, dst, (long unsigned int)*num_vals, (int)type ) );
 
     /** Unpack the declared data type */
     if (ORTE_DSS_BUFFER_FULLY_DESC == buffer->type) {
diff --git a/orte/mca/gpr/replica/api_layer/gpr_replica_dump_local_trigs_subs_api.c b/orte/mca/gpr/replica/api_layer/gpr_replica_dump_local_trigs_subs_api.c
index 7646e28b88..ea4a1d90e4 100644
--- a/orte/mca/gpr/replica/api_layer/gpr_replica_dump_local_trigs_subs_api.c
+++ b/orte/mca/gpr/replica/api_layer/gpr_replica_dump_local_trigs_subs_api.c
@@ -58,7 +58,7 @@ int orte_gpr_replica_dump_local_triggers(void)
             if (NULL == trigs[j]->callback) {
                 opal_output(orte_gpr_base_output, "\tNULL callback");
             } else {
-                opal_output(orte_gpr_base_output, "\tCallback %0x", trigs[j]->callback);
+                opal_output(orte_gpr_base_output, "\tCallback %llx", (unsigned long long)(intptr_t)trigs[j]->callback);
             }
         }
     }
@@ -88,8 +88,9 @@ int orte_gpr_replica_dump_local_subscriptions(void)
             if (NULL == subs[j]->callback) {
                 opal_output(orte_gpr_base_output, "\tNULL callback");
             } else {
-                opal_output(orte_gpr_base_output, "\tCallback %0x", subs[j]->callback);
-            }        }
+                opal_output(orte_gpr_base_output, "\tCallback %llx", (unsigned long long)(intptr_t)subs[j]->callback);
+            }
+        }
     }
     return ORTE_SUCCESS;    
 }
diff --git a/orte/mca/oob/base/oob_base_xcast.c b/orte/mca/oob/base/oob_base_xcast.c
index 15b9073948..7da63e9cf2 100644
--- a/orte/mca/oob/base/oob_base_xcast.c
+++ b/orte/mca/oob/base/oob_base_xcast.c
@@ -134,7 +134,6 @@ static int mca_oob_xcast_binomial_tree(orte_jobid_t job,
         OBJ_DESTRUCT(&xcastmutex);
 
         return ORTE_SUCCESS;
-        
     } 
     
     
diff --git a/orte/mca/oob/tcp/oob_tcp_peer.c b/orte/mca/oob/tcp/oob_tcp_peer.c
index 6bc4a438a4..8b284ef4cd 100644
--- a/orte/mca/oob/tcp/oob_tcp_peer.c
+++ b/orte/mca/oob/tcp/oob_tcp_peer.c
@@ -502,7 +502,7 @@ void mca_oob_tcp_peer_close(mca_oob_tcp_peer_t* peer)
         opal_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_close(%p) sd %d state %d\n",
             ORTE_NAME_ARGS(orte_process_info.my_name),
             ORTE_NAME_ARGS(&(peer->peer_name)),
-            peer,
+            (void*)peer,
             peer->peer_sd,
             peer->peer_state);
     }
diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c
index afb622ee6c..68ac51a87f 100644
--- a/orte/tools/orterun/orterun.c
+++ b/orte/tools/orterun/orterun.c
@@ -688,7 +688,8 @@ static void job_state_callback(orte_jobid_t jobid, orte_proc_state_t state)
             break;
 
         default:
-            opal_output(0, "orterun: job state callback in unexpected state - jobid %lu, state 0x%04x\n", jobid, state);
+            opal_output(0, "orterun: job state callback in unexpected state - jobid %lu, state 0x%04x\n",
+                        (long unsigned int)jobid, state);
             break;
     }
     OPAL_THREAD_UNLOCK(&orterun_globals.lock);