diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-01-29 04:15:31 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-01-29 04:15:31 +0000 |
| commit | 20a2e5f63ac543a10aab0ac157f02a952e143530 (patch) | |
| tree | a0044c9515de85484fdb4b1edb9872f4f7999a37 | |
| parent | 9937a4aa17facdf219c0aabe6bf9efe887daf603 (diff) | |
| download | ATCD-20a2e5f63ac543a10aab0ac157f02a952e143530.tar.gz | |
ChangeLogTag:Fri Jan 28 20:14:20 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/RB_Tree.h | 2 | ||||
| -rw-r--r-- | ace/RB_Tree.i | 7 |
5 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 8a860ec979c..430ddb631b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jan 28 20:14:20 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/RB_Tree.h: + * ace/RB_Tree.i: + current_size() was not const. + Fri Jan 28 13:57:37 2000 Fred Kuhns <fredk@cs.wustl.edu> * fixed QoS realted bugs in QoS_Session_Impl.cpp QoS_Session_Impl.h diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 8a860ec979c..430ddb631b0 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Fri Jan 28 20:14:20 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/RB_Tree.h: + * ace/RB_Tree.i: + current_size() was not const. + Fri Jan 28 13:57:37 2000 Fred Kuhns <fredk@cs.wustl.edu> * fixed QoS realted bugs in QoS_Session_Impl.cpp QoS_Session_Impl.h diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 8a860ec979c..430ddb631b0 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Fri Jan 28 20:14:20 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/RB_Tree.h: + * ace/RB_Tree.i: + current_size() was not const. + Fri Jan 28 13:57:37 2000 Fred Kuhns <fredk@cs.wustl.edu> * fixed QoS realted bugs in QoS_Session_Impl.cpp QoS_Session_Impl.h diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h index 3b505fd34ac..50306570391 100644 --- a/ace/RB_Tree.h +++ b/ace/RB_Tree.h @@ -287,7 +287,7 @@ public: // = Public helper methods. - size_t current_size (void); + size_t current_size (void) const; // Returns the current number of nodes in the tree. void operator= (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt); diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i index 094812f3359..39ad989a068 100644 --- a/ace/RB_Tree.i +++ b/ace/RB_Tree.i @@ -712,7 +712,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::clear () template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size () +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size () const { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size"); return current_size_; @@ -1128,8 +1128,3 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_ return 0; } - - - - - |