diff options
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/Intrusive_List.h | 8 | ||||
| -rw-r--r-- | ACE/ace/Intrusive_List.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/Intrusive_List_Node.h | 1 |
4 files changed, 15 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 5aacecb1f59..a30f3c7b8eb 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Tue Dec 2 20:01:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Intrusive_List.h: + * ace/Intrusive_List.inl: + Use bool for empty/is_empty methods + + * ace/Intrusive_List_Node.h: + Layout change + Tue Dec 2 13:54:35 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> * ace/os_include/os_wchar.h: diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h index 59d0c9054a8..380c07dc284 100644 --- a/ACE/ace/Intrusive_List.h +++ b/ACE/ace/Intrusive_List.h @@ -68,12 +68,12 @@ public: // = Check boundary conditions. - /// Returns 1 if the container is empty, otherwise returns 0. - int is_empty (void) const; + /// Returns true if the container is empty, otherwise returns false. + bool is_empty (void) const; - /// Returns 1 if the container is empty, otherwise returns 0. + /// Returns true if the container is empty, otherwise returns false. /// @deprecated Use is_empty() instead. - int empty (void) const; + bool empty (void) const; /// Insert an element at the beginning of the list void push_front (T *node); diff --git a/ACE/ace/Intrusive_List.inl b/ACE/ace/Intrusive_List.inl index f76370917e9..23d0095a948 100644 --- a/ACE/ace/Intrusive_List.inl +++ b/ACE/ace/Intrusive_List.inl @@ -6,13 +6,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template<class T> ACE_INLINE int +template<class T> ACE_INLINE bool ACE_Intrusive_List<T>::is_empty (void) const { return this->head_ == 0; } -template<class T> ACE_INLINE int +template<class T> ACE_INLINE bool ACE_Intrusive_List<T>::empty (void) const { return this->is_empty (); diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h index b62d681a047..89bb0d1e995 100644 --- a/ACE/ace/Intrusive_List_Node.h +++ b/ACE/ace/Intrusive_List_Node.h @@ -37,7 +37,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * confused using such templates, the class is provided as a helper * for our lucky users that only need portability to modern C++ * compilers. - * */ template <class T> class ACE_Intrusive_List_Node |