From e8afe9d9efbc9406aa8583460e140e394f604fe3 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Mon, 4 Jul 2005 00:16:24 +0000 Subject: [PATCH] * fix some remaining ompi references This commit was SVN r6331. --- opal/class/opal_hash_table.c | 8 ++++---- opal/class/opal_hash_table.h | 2 +- opal/class/opal_object.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opal/class/opal_hash_table.c b/opal/class/opal_hash_table.c index 341b84d408..fa62d70603 100644 --- a/opal/class/opal_hash_table.c +++ b/opal/class/opal_hash_table.c @@ -355,7 +355,7 @@ static OBJ_CLASS_INSTANCE(opal_ptr_hash_node_t, opal_ptr_hash_node_destruct); -static inline uint32_t ompi_hash_value(size_t mask, const void *key, +static inline uint32_t opal_hash_value(size_t mask, const void *key, uint32_t keysize) { uint32_t h, i; @@ -371,7 +371,7 @@ static inline uint32_t ompi_hash_value(size_t mask, const void *key, int opal_hash_table_get_value_ptr(opal_hash_table_t* ht, const void* key, size_t key_size, void **ptr) { - opal_list_t* list = ht->ht_table + ompi_hash_value(ht->ht_mask, key, + opal_list_t* list = ht->ht_table + opal_hash_value(ht->ht_mask, key, key_size); opal_ptr_hash_node_t *node; @@ -398,7 +398,7 @@ int opal_hash_table_get_value_ptr(opal_hash_table_t* ht, const void* key, int opal_hash_table_set_value_ptr(opal_hash_table_t* ht, const void* key, size_t key_size, void* value) { - opal_list_t* list = ht->ht_table + ompi_hash_value(ht->ht_mask, key, + opal_list_t* list = ht->ht_table + opal_hash_value(ht->ht_mask, key, key_size); opal_ptr_hash_node_t *node; @@ -439,7 +439,7 @@ int opal_hash_table_set_value_ptr(opal_hash_table_t* ht, const void* key, int opal_hash_table_remove_value_ptr(opal_hash_table_t* ht, const void* key, size_t key_size) { - opal_list_t* list = ht->ht_table + ompi_hash_value(ht->ht_mask, + opal_list_t* list = ht->ht_table + opal_hash_value(ht->ht_mask, key, key_size); opal_ptr_hash_node_t *node; diff --git a/opal/class/opal_hash_table.h b/opal/class/opal_hash_table.h index f94de923dd..5280c18ed9 100644 --- a/opal/class/opal_hash_table.h +++ b/opal/class/opal_hash_table.h @@ -41,7 +41,7 @@ struct opal_hash_table_t { opal_object_t super; /**< subclass of opal_object_t */ opal_list_t ht_nodes; /**< free list of hash nodes */ - opal_list_t *ht_table; /**< each item is an array of ompi_fhnode_t nodes */ + opal_list_t *ht_table; /**< each item is an array of opal_fhnode_t nodes */ size_t ht_table_size; /**< size of table */ size_t ht_size; /**< number of values on table */ size_t ht_mask; diff --git a/opal/class/opal_object.c b/opal/class/opal_object.c index ca7fe0a978..9bc060b473 100644 --- a/opal/class/opal_object.c +++ b/opal/class/opal_object.c @@ -17,7 +17,7 @@ /** * @file * - * Implementation of opal_object_t, the base ompi foundation class + * Implementation of opal_object_t, the base opal foundation class */ #include "ompi_config.h"