Changeset a47f70c in rtems


Ignore:
Timestamp:
Apr 13, 2012, 7:16:25 AM (8 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
b22ff782
Parents:
52cf1358 (diff), 8c6608bd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/sapi/include/rtems/rbtree.h

    r52cf1358 ra47f70c  
    5353
    5454/**
    55  * @typedef rtems_rbtree_unique
    56  *
    57  * This enum type defines whether the tree can contain nodes with
    58  * duplicate keys.
    59  */
    60 typedef enum {
    61   /** The tree is not unique, insertion of duplicate keys is performed
    62    *  in a FIFO manner. */
    63   RTEMS_RBTREE_DUPLICATE = false,
    64   /** The tree is unique, insertion of duplicate key is refused. */
    65   RTEMS_RBTREE_UNIQUE    = true
    66 } rtems_rbtree_unique;
    67 
    68 /**
    6955 *  @brief RBTree initializer for an empty rbtree with designator @a name.
    7056 */
  • cpukit/sapi/inline/rtems/rbtree.inl

    r52cf1358 ra47f70c  
    4141  size_t                         number_nodes,
    4242  size_t                         node_size,
    43   rtems_rbtree_unique            is_unique
     43  bool                           is_unique
    4444)
    4545{
     
    5656  rtems_rbtree_control          *the_rbtree,
    5757  rtems_rbtree_compare_function  compare_function,
    58   rtems_rbtree_unique            is_unique
     58  bool                           is_unique
    5959)
    6060{
     
    424424/** @brief Determines whether the tree is unique
    425425 */
    426 RTEMS_INLINE_ROUTINE rtems_rbtree_unique rtems_rbtree_is_unique(
     426RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_unique(
    427427  const rtems_rbtree_control *the_rbtree
    428428)
  • testsuites/sptests/sprbtree01/init.c

    r52cf1358 ra47f70c  
    103103
    104104  puts( "Init - Initialize rbtree empty" );
    105   rtems_rbtree_initialize_empty( &rbtree1, &test_compare_function,
    106                                  RTEMS_RBTREE_UNIQUE );
     105  rtems_rbtree_initialize_empty( &rbtree1, &test_compare_function, true );
    107106
    108107  if ( !rtems_rbtree_is_unique( &rbtree1 ) )
     
    543542  rtems_rbtree_initialize( &rbtree1, &test_compare_function,
    544543                           &node_array[0].Node, 100,
    545                            sizeof(test_node), RTEMS_RBTREE_UNIQUE );
     544                           sizeof(test_node), true );
    546545
    547546  puts( "INIT - Removing 100 nodes" );
     
    571570  /* Initialize the tree for duplicate keys */
    572571  puts( "Init - Initialize duplicate rbtree empty" );
    573   rtems_rbtree_initialize_empty( &rbtree1, &test_compare_function,
    574                                  RTEMS_RBTREE_DUPLICATE );
     572  rtems_rbtree_initialize_empty( &rbtree1, &test_compare_function, false );
    575573
    576574  if ( rtems_rbtree_is_unique( &rbtree1 ) )
Note: See TracChangeset for help on using the changeset viewer.