diff options
Diffstat (limited to 'TAO/tao/Request.h')
| -rw-r--r-- | TAO/tao/Request.h | 184 |
1 files changed, 7 insertions, 177 deletions
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h index 309069f30c4..11c857bd456 100644 --- a/TAO/tao/Request.h +++ b/TAO/tao/Request.h @@ -15,7 +15,6 @@ // // = AUTHOR // Copyright 1994-1995 by Sun Microsystems, Inc. -// Additions and RequestSeq by Jeff Parsons <parsons@cs.wustl.edu> // // ============================================================================ @@ -29,9 +28,6 @@ #include "tao/corbafwd.h" #include "tao/NVList.h" #include "tao/Environment.h" -#include "tao/Context.h" -#include "tao/Sequence.h" -#include "tao/Sequence_T.h" class TAO_Export CORBA_Request { @@ -58,17 +54,7 @@ public: CORBA::ExceptionList_ptr exceptions (void); // Return the exceptions resulting from this request. - CORBA::Context_ptr ctx (void) const; - // Accessor for the Context member. - - void ctx (CORBA::Context_ptr); - // Mutator for the Context member. - - CORBA::ContextList_ptr contexts (void); - // Return a list of the request's result's contexts. Since - // TAO does not implement Contexts, this will always be 0. - - CORBA::Environment_ptr env (void); + //CORBA_Environment *env (void); // Return the <Environment> for this request. // Argument manipulation helper functions. @@ -88,7 +74,7 @@ public: CORBA_Any &return_value (void); void invoke (CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment ()); + CORBA::Environment::default_environment ()); // Perform method resolution and invoke an appropriate method. If // the method returns successfully, its result is placed in the // result argument specified on <create_request>. The behavior is @@ -99,18 +85,10 @@ public: // as the user may not be able to propagate the exceptions void send_oneway (CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment ()); + CORBA::Environment::default_environment ()); // Send a oneway request. // A default argument is set, but please note that this not recommended - // as the user may not be able to propagate the exceptions. - - // NOT IMPLEMENTED - these next 3 will just throw CORBA::NO_IMPLEMENT. - void send_deferred (CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment ()); - void get_response (CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment ()); - CORBA::Boolean poll_response (CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment ()); + // as the user may not be able to propagate the exceptions // Pseudo object methods static CORBA_Request* _duplicate (CORBA_Request*); @@ -135,14 +113,10 @@ private: const CORBA::Char *op, CORBA::NVList_ptr args, CORBA::NamedValue_ptr result, - CORBA::Flags flags, - CORBA::Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA::Flags flags); CORBA_Request (CORBA::Object_ptr obj, - const CORBA::Char *op, - CORBA::Environment &TAO_IN_ENV = - CORBA::default_environment ()); + const CORBA::Char *op); ~CORBA_Request (void); @@ -161,18 +135,12 @@ private: CORBA::Flags flags_; // invocation flags - CORBA::Environment env_; + // CORBA_Environment env_; // holds exceptions CORBA::ExceptionList exceptions_; // list of exceptions raised by the operation - CORBA::ContextList_ptr contexts_; - // List of the request's result's contexts. - - CORBA::Context_ptr ctx_; - // Context associated with this request. - CORBA::ULong refcount_; // reference counting @@ -248,144 +216,6 @@ private: CORBA_Request_ptr &ptr_; }; -// Make sure you instantiate this in Request.cpp -class CORBA_ORB_RequestSeq : public TAO_Unbounded_Pseudo_Sequence<CORBA_Request> -{ -public: -// Helpful with template programming. -#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 - typedef CORBA_ORB_RequestSeq_ptr _ptr_type; - typedef CORBA_ORB_RequestSeq_var _var_type; -#endif /* __GNUC__ */ - - // Implement the same constructors provided by the template here, - // check Sequence_T.h for ideas. - // Simply delegate on the template for the implementation... - - CORBA_ORB_RequestSeq (void); - // default ctor - - CORBA_ORB_RequestSeq (CORBA::ULong max); - // Constructor with a "hint" for the maximum capacity. - - CORBA_ORB_RequestSeq (CORBA::ULong maximum, - CORBA::ULong length, - CORBA_Request* * data, - CORBA::Boolean release=0); - // Constructor with a given buffer. - - CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &); - // Copy ctor, deep copies. - - //~CORBA_ORB_RequestSeq (void); - // dtor releases all the contained elements. -}; - -// This class definition should be removed.. But need to -// check with all the compiler guys before we have this removed - -/*class CORBA_ORB_RequestSeq : public TAO_Unbounded_Base_Sequence -{ -public: - - - // Default constructor. - CORBA_ORB_RequestSeq (void); - - // Constructor using a maximum length value. - CORBA_ORB_RequestSeq (CORBA::ULong maximum); - - // Constructor with all the sequence parameters. - CORBA_ORB_RequestSeq (CORBA::ULong maximum, - CORBA::ULong length, - CORBA::Request_ptr *data, - CORBA::Boolean release = 0); - - // Copy constructor. - CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs); - - // Assignment operator. - CORBA_ORB_RequestSeq &operator= (const CORBA_ORB_RequestSeq &rhs); - - // Dtor. - ~CORBA_ORB_RequestSeq (void); - - // = Accessors. - CORBA::Request_ptr operator[] (CORBA::ULong i); - - const CORBA::Request* operator[] (CORBA::ULong i) const; - - // = Static operations. - - // Allocate storage for the sequence. - static CORBA::Request_ptr *allocbuf (CORBA::ULong size); - - // Free the sequence. - static void freebuf (CORBA::Request_ptr *buffer); - - virtual void _allocate_buffer (CORBA::ULong length); - - virtual void _deallocate_buffer (void); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - CORBA::Request_ptr *get_buffer (CORBA::Boolean orphan = 0); - - const CORBA::Request_ptr *get_buffer (void) const; - - void replace (CORBA::ULong max, - CORBA::ULong length, - CORBA::Request_ptr *data, - CORBA::Boolean release); -}; -*/ -class CORBA_ORB_RequestSeq_var -{ -public: - CORBA_ORB_RequestSeq_var (void); // default constructor - CORBA_ORB_RequestSeq_var (CORBA_ORB_RequestSeq *); - CORBA_ORB_RequestSeq_var (const CORBA_ORB_RequestSeq_var &); // copy constructor - ~CORBA_ORB_RequestSeq_var (void); // destructor - - CORBA_ORB_RequestSeq_var &operator= (CORBA_ORB_RequestSeq *); - CORBA_ORB_RequestSeq_var &operator= (const CORBA_ORB_RequestSeq_var &); - CORBA_ORB_RequestSeq *operator-> (void); - const CORBA_ORB_RequestSeq *operator-> (void) const; - - operator const CORBA_ORB_RequestSeq &() const; - operator CORBA_ORB_RequestSeq &(); - operator CORBA_ORB_RequestSeq &() const; - CORBA::Octet &operator[] (CORBA::ULong index); - // in, inout, out, _retn - const CORBA_ORB_RequestSeq &in (void) const; - CORBA_ORB_RequestSeq &inout (void); - CORBA_ORB_RequestSeq *&out (void); - CORBA_ORB_RequestSeq *_retn (void); - CORBA_ORB_RequestSeq *ptr (void) const; - -private: - CORBA_ORB_RequestSeq *ptr_; -}; - -class CORBA_ORB_RequestSeq_out -{ -public: - CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq *&); - CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq_var &); - CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq_out &); - CORBA_ORB_RequestSeq_out &operator= (CORBA_ORB_RequestSeq_out &); - CORBA_ORB_RequestSeq_out &operator= (CORBA_ORB_RequestSeq *); - operator CORBA_ORB_RequestSeq *&(); - CORBA_ORB_RequestSeq *&ptr (void); - CORBA_ORB_RequestSeq *operator-> (void); - CORBA::Octet &operator[] (CORBA::ULong index); - -private: - CORBA_ORB_RequestSeq *&ptr_; - // assignment from T_var not allowed - void operator= (const CORBA_ORB_RequestSeq_var &); -}; - #if defined (__ACE_INLINE__) # include "tao/Request.i" #endif /* __ACE_INLINE__ */ |