diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-04-13 09:10:12 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-04-13 09:14:18 +0200 |
| commit | 8c6608bd1b1eed2a956f4268ea03fa0e05ec9a94 (patch) | |
| tree | db86a943b143711e76130e773e929272622f4e11 /cpukit | |
| parent | bsp/stm32f4: Add IO and RCC (diff) | |
| download | rtems-8c6608bd1b1eed2a956f4268ea03fa0e05ec9a94.tar.bz2 | |
rbtree: PR2046: Replace rtems_rbtree_unique
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/sapi/include/rtems/rbtree.h | 14 | ||||
| -rw-r--r-- | cpukit/sapi/inline/rtems/rbtree.inl | 6 |
2 files changed, 3 insertions, 17 deletions
diff --git a/cpukit/sapi/include/rtems/rbtree.h b/cpukit/sapi/include/rtems/rbtree.h index 9a09b27650..c39512d917 100644 --- a/cpukit/sapi/include/rtems/rbtree.h +++ b/cpukit/sapi/include/rtems/rbtree.h @@ -52,20 +52,6 @@ typedef RBTree_Control rtems_rbtree_control; typedef RBTree_Compare_function rtems_rbtree_compare_function; /** - * @typedef rtems_rbtree_unique - * - * This enum type defines whether the tree can contain nodes with - * duplicate keys. - */ -typedef enum { - /** The tree is not unique, insertion of duplicate keys is performed - * in a FIFO manner. */ - RTEMS_RBTREE_DUPLICATE = false, - /** The tree is unique, insertion of duplicate key is refused. */ - RTEMS_RBTREE_UNIQUE = true -} rtems_rbtree_unique; - -/** * @brief RBTree initializer for an empty rbtree with designator @a name. */ #define RTEMS_RBTREE_INITIALIZER_EMPTY(name) \ diff --git a/cpukit/sapi/inline/rtems/rbtree.inl b/cpukit/sapi/inline/rtems/rbtree.inl index 1a2e99e30b..ab81baf23b 100644 --- a/cpukit/sapi/inline/rtems/rbtree.inl +++ b/cpukit/sapi/inline/rtems/rbtree.inl @@ -40,7 +40,7 @@ RTEMS_INLINE_ROUTINE void rtems_rbtree_initialize( void *starting_address, size_t number_nodes, size_t node_size, - rtems_rbtree_unique is_unique + bool is_unique ) { _RBTree_Initialize( the_rbtree, compare_function, starting_address, @@ -55,7 +55,7 @@ RTEMS_INLINE_ROUTINE void rtems_rbtree_initialize( RTEMS_INLINE_ROUTINE void rtems_rbtree_initialize_empty( rtems_rbtree_control *the_rbtree, rtems_rbtree_compare_function compare_function, - rtems_rbtree_unique is_unique + bool is_unique ) { _RBTree_Initialize_empty( the_rbtree, compare_function, is_unique ); @@ -423,7 +423,7 @@ RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_insert( /** @brief Determines whether the tree is unique */ -RTEMS_INLINE_ROUTINE rtems_rbtree_unique rtems_rbtree_is_unique( +RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_unique( const rtems_rbtree_control *the_rbtree ) { |