diff options
| -rw-r--r-- | TAO/tao/Exception.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 9 | ||||
| -rw-r--r-- | TAO/tao/Exception.i | 2 | ||||
| -rw-r--r-- | TAO/tao/corba.h | 4 | ||||
| -rw-r--r-- | TAO/tao/params.cpp | 24 | ||||
| -rw-r--r-- | TAO/tao/params.h | 29 | ||||
| -rw-r--r-- | TAO/tao/params.i | 7 |
7 files changed, 49 insertions, 32 deletions
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 645ac44cb9b..808983bc8d9 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -1,4 +1,4 @@ -// $id: Exception.cpp,v 1.29 1998/03/16 17:19:58 coryan Exp $ +// $Id$ // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved @@ -11,7 +11,7 @@ #include "tao/corba.h" #if !defined (__ACE_INLINE__) -# include "Exception.i" +# include "tao/Exception.i" #endif /* __ACE_INLINE__ */ // Static initializers. @@ -217,7 +217,7 @@ CORBA_SystemException::operator = (const CORBA_SystemException &src) this->type_ = src.type_; if (this->type_) this->type_->AddRef (); - + this->minor_ = src.minor_; this->completed_ = src.completed_; diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 596354b3910..d665ca10f31 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -1,4 +1,5 @@ // This may look like C, but it's really -*- C++ -*- +// $Id$ // ============================================================================ // @@ -146,8 +147,8 @@ public: // extension CORBA_SystemException (CORBA::TypeCode_ptr tc, - CORBA::ULong code, - CORBA::CompletionStatus completed); + CORBA::ULong code, + CORBA::CompletionStatus completed); // ctor using a TypeCode virtual int _is_a (const char *type_id) const; @@ -287,4 +288,8 @@ public: static CORBA::ExceptionList system_exceptions; }; +#if defined (__ACE_INLINE__) +# include "tao/Exception.i" +#endif /* __ACE_INLINE__ */ + #endif /* TAO_EXCEPTION_H */ diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i index c3de1104ca9..a629b7b13d2 100644 --- a/TAO/tao/Exception.i +++ b/TAO/tao/Exception.i @@ -1,4 +1,5 @@ // This may look like C, but it's really -*- C++ -*- +// $Id$ ACE_INLINE void * CORBA_Exception::operator new (size_t, @@ -42,4 +43,3 @@ CORBA::Exception_ptr CORBA_Environment::exception (void) const { return this->exception_; } - diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index f08071b7384..abbe018f15a 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -226,6 +226,8 @@ extern TAO_Export int operator== (const TAO_ObjectKey &l, #include "tao/IIOP_Object.i" #include "tao/Server_Request.i" #include "tao/Request.i" +#include "tao/params.i" +#include "Exception.i" #endif /* 0 */ # if defined (do_undef_on_ACE_INLINE) @@ -236,8 +238,6 @@ extern TAO_Export int operator== (const TAO_ObjectKey &l, // The following *.i files are conditionally included here. #if defined (__ACE_INLINE__) -#include "tao/params.i" -#include "Exception.i" #include "tao/default_client.i" #include "tao/default_server.i" #include "tao/Connect.i" diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index 2f1eea5dd06..83fa58fcea8 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -1,5 +1,11 @@ +// $Id$ + #include "tao/corba.h" +#if !defined (__ACE_INLINE__) +# include "tao/params.i" +#endif /* __ACE_INLINE__ */ + TAO_ORB_Parameters::TAO_ORB_Parameters (void) : name_service_ior_ (0), name_service_port_ (0), @@ -26,7 +32,7 @@ TAO_ORB_Parameters::addr (void) return this->addr_; } -void +void TAO_ORB_Parameters::name_service_ior (CORBA::String ns) { this->name_service_ior_ = ns; @@ -34,7 +40,7 @@ TAO_ORB_Parameters::name_service_ior (CORBA::String ns) // Set the IOR of our name service. -CORBA::String +CORBA::String TAO_ORB_Parameters::name_service_ior (void) { return this->name_service_ior_; @@ -42,7 +48,7 @@ TAO_ORB_Parameters::name_service_ior (void) // Get the IOR of our name service. -void +void TAO_ORB_Parameters::name_service_port (CORBA::UShort port) { this->name_service_port_ = port; @@ -50,14 +56,14 @@ TAO_ORB_Parameters::name_service_port (CORBA::UShort port) // Set the port of our name service. -CORBA::UShort +CORBA::UShort TAO_ORB_Parameters::name_service_port (void) { return this->name_service_port_; } -void +void TAO_ORB_Parameters::trading_service_ior (CORBA::String ns) { this->trading_service_ior_ = ns; @@ -65,7 +71,7 @@ TAO_ORB_Parameters::trading_service_ior (CORBA::String ns) // Set the IOR of our trading service. -CORBA::String +CORBA::String TAO_ORB_Parameters::trading_service_ior (void) { return this->trading_service_ior_; @@ -73,7 +79,7 @@ TAO_ORB_Parameters::trading_service_ior (void) // Get the IOR of our trading service. -void +void TAO_ORB_Parameters::trading_service_port (CORBA::UShort port) { this->trading_service_port_ = port; @@ -81,13 +87,13 @@ TAO_ORB_Parameters::trading_service_port (CORBA::UShort port) // Set the port of our trading service. -CORBA::UShort +CORBA::UShort TAO_ORB_Parameters::trading_service_port (void) { return this->trading_service_port_; } -void +void TAO_OA_Parameters::demux_strategy (const char* strategy) { // Determine the demux strategy based on the given name diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 4d2567a78b5..89c6241823b 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -1,16 +1,17 @@ /* -*- C++ -*- */ +// $Id$ // ============================================================================ // // = LIBRARY // TAO -// +// // = FILENAME // params.h // // = AUTHOR // Chris Cleeland -// +// // ============================================================================ #if !defined (TAO_PARAMS_H) @@ -43,10 +44,10 @@ class TAO_Export TAO_ORB_Parameters public: TAO_ORB_Parameters (void); // Constructor. - + ~TAO_ORB_Parameters (void); // Destructor. - + void addr (const ACE_INET_Addr &addr); // Set the address on which we're listening. @@ -64,7 +65,7 @@ public: CORBA::UShort name_service_port (void); // Get the port of our name service. - + void trading_service_ior (CORBA::String ns); // Set the IOR of our trading service. @@ -90,7 +91,7 @@ public: // Set the size to be used for a socket's send buffer. private: - ACE_INET_Addr addr_; + ACE_INET_Addr addr_; // host + port number we are listening on CORBA::String name_service_ior_; @@ -112,7 +113,7 @@ private: // Size to be used for a socket's send buffer. }; -typedef enum +typedef enum { TAO_NONE, TAO_LINEAR, @@ -138,16 +139,16 @@ public: TAO_LOCAL_INLINE ~TAO_OA_Parameters (void); // Destructor - + void demux_strategy (const char *strategy); // Specify the demultiplexing strategy to be used via <{strategy}>. // Valid values are one of (case matters) "linear", "dynamic_hash", // "user_def", or "active_demux". If the value is not valid, then // <Dynamic Hash> is used as a default. - + TAO_LOCAL_INLINE void demux_strategy (TAO_Demux_Strategy s); // Specify the demultiplexing strategy to be used. - + TAO_LOCAL_INLINE TAO_Demux_Strategy demux_strategy (void); // Return the demultiplexing strategy being used. @@ -165,14 +166,18 @@ public: // get the table size for the lookup table private: - TAO_Demux_Strategy demux_; + TAO_Demux_Strategy demux_; // demux strategy - CORBA::ULong tablesize_; + CORBA::ULong tablesize_; // size of object lookup table TAO_Object_Table_Impl *ot_; // concrete lookup table instance }; +#if defined (__ACE_INLINE__) +# include "tao/params.i" +#endif /* __ACE_INLINE__ */ + #endif /* TAO_PARAMS_H */ diff --git a/TAO/tao/params.i b/TAO/tao/params.i index 9a0e11ef157..f4b8a76a182 100644 --- a/TAO/tao/params.i +++ b/TAO/tao/params.i @@ -1,16 +1,17 @@ /* -*- C++ -*- */ +// $Id$ // ============================================================================ // // = LIBRARY // TAO -// +// // = FILENAME // params.i // // = AUTHOR // Chris Cleeland -// +// // ============================================================================ ACE_INLINE @@ -48,7 +49,7 @@ TAO_OA_Parameters::tablesize (void) return this->tablesize_; } -ACE_INLINE void +ACE_INLINE void TAO_OA_Parameters::userdef_lookup_strategy (TAO_Object_Table_Impl *&ot) { // provide a way for user defined object key lookup strategies to be plugged |