diff options
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Containers.i | 4 | ||||
| -rw-r--r-- | ace/IOStream.h | 6 | ||||
| -rw-r--r-- | ace/OS.cpp | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/ace/Containers.i b/ace/Containers.i index 96bcf73614c..87ea4b4016a 100644 --- a/ace/Containers.i +++ b/ace/Containers.i @@ -140,8 +140,8 @@ ACE_Unbounded_Stack<T>::is_full (void) const return 0; // ??? } -template <class TYPE> ACE_INLINE size_t -ACE_Unbounded_Queue<TYPE>::size (void) const +template <class T> ACE_INLINE size_t +ACE_Unbounded_Queue<T>::size (void) const { return this->cur_size_; } diff --git a/ace/IOStream.h b/ace/IOStream.h index b1fff35c349..11cf840bfa9 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -79,8 +79,8 @@ #if !defined (ACE_IOSTREAM_H) #define ACE_IOSTREAM_H -#include "ace/OS.h" #include "ace/INET_Addr.h" +#include "ace/Handle_Set.h" #include <iomanip.h> #if defined (ACE_HAS_STRING_CLASS) @@ -94,6 +94,10 @@ typedef String ACE_IOStream_String; #if defined (ACE_HAS_STRING_CLASS) +#if defined (__alpha) +#include <stl_macros> +#endif /* __alpha */ + class QuotedString : public ACE_IOStream_String { public: diff --git a/ace/OS.cpp b/ace/OS.cpp index 080812b9762..44eeafc6952 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -694,7 +694,7 @@ class ACE_TSS_Ref // "Reference count" for thread-specific storage keys. // // = DESCRIPTION - // Since the ACE_Unbounded_Set doesn't allow duplicates, the + // Since the <ACE_Unbounded_Stack> doesn't allow duplicates, the // "reference count" is the identify of the thread_id. { public: @@ -733,8 +733,8 @@ ACE_TSS_Ref::operator== (const ACE_TSS_Ref &info) return this->tid_ == info.tid_; } -typedef ACE_Unbounded_Set<ACE_TSS_Ref> ACE_TSS_REF_TABLE; -typedef ACE_Unbounded_Set_Iterator<ACE_TSS_Ref> ACE_TSS_REF_TABLE_ITERATOR; +typedef ACE_Unbounded_Stack<ACE_TSS_Ref> ACE_TSS_REF_TABLE; +typedef ACE_Unbounded_Stack_Iterator<ACE_TSS_Ref> ACE_TSS_REF_TABLE_ITERATOR; class ACE_TSS_Info // = TITLE @@ -822,8 +822,8 @@ ACE_TSS_Info::dump (void) // Create a set of <ACE_TSS_Info> objects that will reside // within thread-specific storage. -typedef ACE_Unbounded_Set<ACE_TSS_Info> ACE_TSS_TABLE; -typedef ACE_Unbounded_Set_Iterator<ACE_TSS_Info> ACE_TSS_TABLE_ITERATOR; +typedef ACE_Unbounded_Stack<ACE_TSS_Info> ACE_TSS_TABLE; +typedef ACE_Unbounded_Stack_Iterator<ACE_TSS_Info> ACE_TSS_TABLE_ITERATOR; class ACE_TSS_Cleanup // = TITLE |