From 11815d9773ecdffb7bd7ca3daec1cb5ede461eb8 Mon Sep 17 00:00:00 2001 From: Aurelien Bouteiller Date: Thu, 24 Jan 2008 04:59:31 +0000 Subject: [PATCH] Fixed two warnings (especially the one that get repeted a large number of times in 64bit builds) This commit was SVN r17197. --- .../pessimist/vprotocol_pessimist_event.h | 4 +++- .../pessimist/vprotocol_pessimist_request.c | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ompi/mca/pml/v/vprotocol/pessimist/vprotocol_pessimist_event.h b/ompi/mca/pml/v/vprotocol/pessimist/vprotocol_pessimist_event.h index 249a6035fd..b9218ba95a 100644 --- a/ompi/mca/pml/v/vprotocol/pessimist/vprotocol_pessimist_event.h +++ b/ompi/mca/pml/v/vprotocol/pessimist/vprotocol_pessimist_event.h @@ -14,11 +14,13 @@ #include "ompi_config.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/pml/base/pml_base_request.h" +#include BEGIN_C_DECLS +/* Make sure -Wformat is happy... */ typedef uint64_t vprotocol_pessimist_clock_t; -#define PRIpclock "llx" +#define PRIpclock PRIx64 typedef enum { VPROTOCOL_PESSIMIST_EVENT_TYPE_MATCHING, diff --git a/ompi/mca/pml/v/vprotocol/pessimist/vprotocol_pessimist_request.c b/ompi/mca/pml/v/vprotocol/pessimist/vprotocol_pessimist_request.c index 74dfea6ff0..1f2863195d 100644 --- a/ompi/mca/pml/v/vprotocol/pessimist/vprotocol_pessimist_request.c +++ b/ompi/mca/pml/v/vprotocol/pessimist/vprotocol_pessimist_request.c @@ -23,13 +23,13 @@ OBJ_CLASS_INSTANCE(mca_vprotocol_pessimist_send_request_t, mca_pml_base_request_ static void vprotocol_pessimist_request_construct(mca_pml_base_request_t *req) { - V_OUTPUT_VERBOSE(250, "pessimist:\treq\tnew\treq=%p\tPreq=%p (aligned to %p)", (void *) req, (void *) VPESSIMIST_REQ(req), (void *) &(VPESSIMIST_REQ(req)->pml_req_free)); - req->req_ompi.req_status.MPI_SOURCE = -1; /* no matching made flag */ - VPESSIMIST_REQ(req)->pml_req_free = req->req_ompi.req_free; - VPESSIMIST_REQ(req)->event = NULL; -/* VPESSIMIST_REQ(req)->sb_reqs[0] = NULL;*/ - assert(VPESSIMIST_REQ(req)->pml_req_free == req->req_ompi.req_free); /* detection of aligment issues on different arch */ - req->req_ompi.req_free = mca_vprotocol_pessimist_request_free; + V_OUTPUT_VERBOSE(250, "pessimist:\treq\tnew\treq=%p\tPreq=%p (aligned to %p)", (void *) req, (void *) VPESSIMIST_REQ(req), (void *) &(VPESSIMIST_REQ(req)->pml_req_free)); + req->req_ompi.req_status.MPI_SOURCE = -1; /* no matching made flag */ + VPESSIMIST_REQ(req)->pml_req_free = req->req_ompi.req_free; + VPESSIMIST_REQ(req)->event = NULL; +/* VPESSIMIST_REQ(req)->sb_reqs[0] = NULL;*/ + assert(VPESSIMIST_REQ(req)->pml_req_free == req->req_ompi.req_free); /* detection of aligment issues on different arch */ + req->req_ompi.req_free = mca_vprotocol_pessimist_request_free; } int mca_vprotocol_pessimist_request_free(ompi_request_t **req)