summaryrefslogtreecommitdiff
path: root/ace/Stream.h
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-11-07 07:37:25 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-11-07 07:37:25 +0000
commitc52c508239c395e9a4f30285bb308c14a90e2595 (patch)
treeccdfa1209f9f9fde5a031792ad96667e2e339e05 /ace/Stream.h
parent77e5f9a82914fe768602cce4eed698faac414a64 (diff)
downloadATCD-c52c508239c395e9a4f30285bb308c14a90e2595.tar.gz
*** empty log message ***
Diffstat (limited to 'ace/Stream.h')
-rw-r--r--ace/Stream.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/ace/Stream.h b/ace/Stream.h
index d0a9a2addeb..a3803293072 100644
--- a/ace/Stream.h
+++ b/ace/Stream.h
@@ -26,10 +26,10 @@
#include "ace/Module.h"
// Forward decls.
-template<ACE_SYNCH_1> class ACE_Stream_Iterator;
-//template<ACE_SYNCH_1> class ACE_Module;
+template<ACE_SYNCH_DECL> class ACE_Stream_Iterator;
+//template<ACE_SYNCH_DECL> class ACE_Module;
-template <ACE_SYNCH_1>
+template <ACE_SYNCH_DECL>
class ACE_Stream
// = TITLE
// This class is the primary abstraction for the ASX framework.
@@ -39,7 +39,7 @@ class ACE_Stream
// A Stream consists of a stack of <ACE_Modules>, each of which
// contains two <ACE_Tasks>.
{
-friend class ACE_Stream_Iterator<ACE_SYNCH_2>;
+friend class ACE_Stream_Iterator<ACE_SYNCH_USE>;
public:
enum
{
@@ -50,16 +50,16 @@ public:
// = Initializatation and termination methods.
ACE_Stream (void *arg = 0,
- ACE_Module<ACE_SYNCH_2> *head = 0,
- ACE_Module<ACE_SYNCH_2> *tail = 0);
+ ACE_Module<ACE_SYNCH_USE> *head = 0,
+ ACE_Module<ACE_SYNCH_USE> *tail = 0);
// Create a Stream consisting of <head> and <tail> as the Stream
// head and Stream tail, respectively. If these are 0 then the
// <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively.
// <arg> is the value past in to the open() methods of the tasks.
int open (void *arg,
- ACE_Module<ACE_SYNCH_2> *head = 0,
- ACE_Module<ACE_SYNCH_2> *tail = 0);
+ ACE_Module<ACE_SYNCH_USE> *head = 0,
+ ACE_Module<ACE_SYNCH_USE> *tail = 0);
// Create a Stream consisting of <head> and <tail> as the Stream
// head and Stream tail, respectively. If these are 0 then the
// <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively.
@@ -73,13 +73,13 @@ public:
// = ACE_Stream plumbing operations
- int push (ACE_Module<ACE_SYNCH_2> *mod);
+ int push (ACE_Module<ACE_SYNCH_USE> *mod);
// Add a new module <mod> right below the Stream head.
int pop (int flags = M_DELETE);
// Remove the <mod> right below the Stream head and close it down.
- int top (ACE_Module<ACE_SYNCH_2> *&mod);
+ int top (ACE_Module<ACE_SYNCH_USE> *&mod);
// Return the top module on the stream (right below the stream
// head).
@@ -87,16 +87,16 @@ public:
// Remove the named module <mod> from the stream. This bypasses the
// strict LIFO ordering of push() and pop().
- ACE_Module<ACE_SYNCH_2> *head (void);
+ ACE_Module<ACE_SYNCH_USE> *head (void);
// Return current stream head.
- ACE_Module<ACE_SYNCH_2> *tail (void);
+ ACE_Module<ACE_SYNCH_USE> *tail (void);
// Return current stream tail.
- ACE_Module<ACE_SYNCH_2> *find (const char *mod);
+ ACE_Module<ACE_SYNCH_USE> *find (const char *mod);
// Find a particular ACE_Module.
- int link (ACE_Stream<ACE_SYNCH_2> &);
+ int link (ACE_Stream<ACE_SYNCH_USE> &);
// Create a pipe between two Streams.
int unlink (void);
@@ -132,22 +132,22 @@ private:
// Actually perform the unlinking of two Streams (must be called
// with locks held).
- int link_i (ACE_Stream<ACE_SYNCH_2> &);
+ int link_i (ACE_Stream<ACE_SYNCH_USE> &);
// Actually perform the linking of two Streams (must be called with
// locks held).
- int push_module (ACE_Module<ACE_SYNCH_2> *,
- ACE_Module<ACE_SYNCH_2> * = 0,
- ACE_Module<ACE_SYNCH_2> * = 0);
+ int push_module (ACE_Module<ACE_SYNCH_USE> *,
+ ACE_Module<ACE_SYNCH_USE> * = 0,
+ ACE_Module<ACE_SYNCH_USE> * = 0);
// Must a new module onto the Stream.
- ACE_Module<ACE_SYNCH_2> *stream_head_;
+ ACE_Module<ACE_SYNCH_USE> *stream_head_;
// Pointer to the head of the stream.
- ACE_Module<ACE_SYNCH_2> *stream_tail_;
+ ACE_Module<ACE_SYNCH_USE> *stream_tail_;
// Pointer to the tail of the stream.
- ACE_Stream<ACE_SYNCH_2> *linked_us_;
+ ACE_Stream<ACE_SYNCH_USE> *linked_us_;
// Pointer to an adjoining linked stream.
// = Synchronization objects used for thread-safe streams.
@@ -158,18 +158,18 @@ private:
// Use to tell all threads waiting on the close that we are done.
};
-template <ACE_SYNCH_1>
+template <ACE_SYNCH_DECL>
class ACE_Stream_Iterator
// = TITLE
// Iterate through an <ACE_Stream>.
{
public:
// = Initialization method.
- ACE_Stream_Iterator (const ACE_Stream<ACE_SYNCH_2> &sr);
+ ACE_Stream_Iterator (const ACE_Stream<ACE_SYNCH_USE> &sr);
// = Iteration methods.
- int next (const ACE_Module<ACE_SYNCH_2> *&next_item);
+ int next (const ACE_Module<ACE_SYNCH_USE> *&next_item);
// Pass back the <next_item> that hasn't been seen in the set.
// Returns 0 when all items have been seen, else 1.
@@ -181,7 +181,7 @@ public:
// items in the set have been seen, else 1.
private:
- ACE_Module<ACE_SYNCH_2> *next_;
+ ACE_Module<ACE_SYNCH_USE> *next_;
// Next <Module> that we haven't yet seen.
};