From 9d73217637f2a6d4c3c1d61ee3cd8ee210365b4d Mon Sep 17 00:00:00 2001
From: Galen Shipman <gshipman@lanl.gov>
Date: Sun, 11 Jun 2006 20:19:12 +0000
Subject: [PATCH] These list items are free list items, and should inherit
 properly..

This commit was SVN r10295.
---
 ompi/mca/mpool/base/mpool_base_tree.c | 2 +-
 ompi/mca/mpool/base/mpool_base_tree.h | 4 ++--
 ompi/mca/rcache/rb/rcache_rb_tree.h   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ompi/mca/mpool/base/mpool_base_tree.c b/ompi/mca/mpool/base/mpool_base_tree.c
index c5bae1cd18..d99a29dca7 100644
--- a/ompi/mca/mpool/base/mpool_base_tree.c
+++ b/ompi/mca/mpool/base/mpool_base_tree.c
@@ -113,5 +113,5 @@ mca_mpool_base_tree_item_t* mca_mpool_base_tree_item_get(void) {
  */
 void mca_mpool_base_tree_item_put(mca_mpool_base_tree_item_t* item) { 
     OMPI_FREE_LIST_RETURN(&mca_mpool_base_tree_item_free_list,
-                          item);
+                          &(item->super));
 }
diff --git a/ompi/mca/mpool/base/mpool_base_tree.h b/ompi/mca/mpool/base/mpool_base_tree.h
index b816f00319..30eb380e05 100644
--- a/ompi/mca/mpool/base/mpool_base_tree.h
+++ b/ompi/mca/mpool/base/mpool_base_tree.h
@@ -21,7 +21,7 @@
 #define MCA_MPOOL_BASE_TREE_MAX 8
 #include "opal/mca/mca.h"
 #include "ompi/info/info.h"
-#include "opal/class/opal_list.h" 
+#include "ompi/class/ompi_free_list.h" 
 #include "ompi/class/ompi_rb_tree.h"
 #include "ompi/mca/mpool/mpool.h"
 
@@ -35,7 +35,7 @@
  */
 struct mca_mpool_base_tree_item_t
 {
-    opal_list_item_t super;   /**< the parent class */
+    ompi_free_list_item_t super;   /**< the parent class */
     void* key; /* the address this was alloc'd on */
     mca_mpool_base_module_t* mpools[MCA_MPOOL_BASE_TREE_MAX]; /**< the mpools */
     mca_mpool_base_registration_t* regs[MCA_MPOOL_BASE_TREE_MAX]; /**< the registrations */  
diff --git a/ompi/mca/rcache/rb/rcache_rb_tree.h b/ompi/mca/rcache/rb/rcache_rb_tree.h
index 3c5a66ecff..ca82a05406 100644
--- a/ompi/mca/rcache/rb/rcache_rb_tree.h
+++ b/ompi/mca/rcache/rb/rcache_rb_tree.h
@@ -24,7 +24,7 @@
 #define MCA_RCACHE_RB_TREE_H
 #include "opal/mca/mca.h"
 #include "ompi/info/info.h"
-#include "opal/class/opal_list.h" 
+#include "ompi/class/ompi_free_list.h"
 #include "ompi/mca/mpool/mpool.h"
 #include "rcache_rb.h"
 /*
@@ -46,7 +46,7 @@ typedef struct mca_rcache_rb_tree_key_t mca_rcache_rb_tree_key_t;
  */
 struct mca_rcache_rb_tree_item_t
 {
-    opal_list_item_t super;   /**< the parent class */
+    ompi_free_list_item_t super;   /**< the parent class */
     mca_rcache_rb_tree_key_t key; /**< the key which holds the memory pointers */
     mca_mpool_base_registration_t* reg; /**< the registration */  
 };