1
1

Corrected patch from Tetsuya Mishima (i.e., a more correct fix than

r30086: make sure that a super item is constructed properly).

Refs trac:4035

This commit was SVN r30090.

The following SVN revision numbers were found above:
  r30086 --> open-mpi/ompi@d1c63f878e

The following Trac tickets were found above:
  Ticket 4035 --> https://svn.open-mpi.org/trac/ompi/ticket/4035
Этот коммит содержится в:
Jeff Squyres 2013-12-26 12:41:39 +00:00
родитель 92cf175e9e
Коммит 9ba0d19ef1

Просмотреть файл

@ -79,12 +79,13 @@ static void opal_tree_item_destruct(opal_tree_item_t *item)
static void opal_tree_construct(opal_tree_t *tree) static void opal_tree_construct(opal_tree_t *tree)
{ {
OBJ_CONSTRUCT( &(tree->opal_tree_sentinel), opal_tree_item_t );
#if OPAL_ENABLE_DEBUG #if OPAL_ENABLE_DEBUG
/* These refcounts should never be used in assertions because they /* These refcounts should never be used in assertions because they
should never be removed from this list, added to another list, should never be removed from this list, added to another list,
etc. So set them to sentinel values. */ etc. So set them to sentinel values. */
OBJ_CONSTRUCT( &(tree->opal_tree_sentinel), opal_tree_item_t );
tree->opal_tree_sentinel.opal_tree_item_refcount = 1; tree->opal_tree_sentinel.opal_tree_item_refcount = 1;
tree->opal_tree_sentinel.opal_tree_item_belong_to = tree; tree->opal_tree_sentinel.opal_tree_item_belong_to = tree;
#endif #endif
@ -128,7 +129,6 @@ void opal_tree_init(opal_tree_t *tree, opal_tree_comp_fn_t comp,
tree->serialize = serialize; tree->serialize = serialize;
tree->deserialize = deserialize; tree->deserialize = deserialize;
tree->get_key = get_key; tree->get_key = get_key;
opal_tree_get_root(tree)->opal_tree_num_children = 0;
} }
/* /*