diff options
Diffstat (limited to 'TAO/tao/corbafwd.h')
| -rw-r--r-- | TAO/tao/corbafwd.h | 533 |
1 files changed, 96 insertions, 437 deletions
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 46305700add..f4fcae7d5f3 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -27,7 +27,7 @@ #define TAO_CORBAFWD_H // @@ TODO take the portion that we need of ace/CDR_Stream.h into -// ace/CDR_Types.h +// ace/CDR_Types.h #include "ace/CDR_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -61,8 +61,6 @@ # endif #endif /* _MSC_VER */ -#define TAO_DEFAULT_MINOR_CODE 0xffff0000L - // Forward declarations of some data types are needed. class CORBA_Any; @@ -98,7 +96,6 @@ class CORBA_UserException; class CORBA_SystemException; class CORBA_UnknownUserException; class CORBA_ExceptionList; -class CORBA_ExceptionList_var; typedef class CORBA_Exception *CORBA_Exception_ptr; // all the system exception classes, the list is used as follows: @@ -131,80 +128,28 @@ typedef class CORBA_Exception *CORBA_Exception_ptr; TAO_SYSTEM_EXCEPTION(INTF_REPOS); \ TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \ TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \ - TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \ - TAO_SYSTEM_EXCEPTION(INV_POLICY); \ - TAO_SYSTEM_EXCEPTION(REBIND); \ - TAO_SYSTEM_EXCEPTION(TIMEOUT); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \ - TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); + TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); #define TAO_SYSTEM_EXCEPTION(name) \ class CORBA_ ## name TAO_SYSTEM_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION -#if !defined (TAO_HAS_MINIMUM_CORBA) - -class CORBA_WrongTransaction; -typedef CORBA_WrongTransaction *CORBA_WrongTransaction_ptr; - -struct CORBA_NameValuePair; -class CORBA_NameValuePair_var; -class CORBA_NameValuePair_out; -typedef CORBA_NameValuePair *CORBA_NameValuePair_ptr; - class CORBA_Request; class CORBA_Request_var; class CORBA_Request_out; typedef class CORBA_Request *CORBA_Request_ptr; -class CORBA_ORB_RequestSeq; -class CORBA_ORB_RequestSeq_var; -class CORBA_ORB_RequestSeq_out; -typedef class CORBA_ORB_RequestSeq *CORBA_ORB_RequestSeq_ptr; - class CORBA_NamedValue; class CORBA_NamedValue_var; class CORBA_NamedValue_out; typedef class CORBA_NamedValue *CORBA_NamedValue_ptr; - class CORBA_NVList; class CORBA_NVList_var; class CORBA_NVList_out; typedef class CORBA_NVList *CORBA_NVList_ptr; -class CORBA_Context; -class CORBA_Context_var; -class CORBA_Context_out; -typedef class CORBA_Context *CORBA_Context_ptr; - -class CORBA_ContextList; -class CORBA_ContextList_var; -class CORBA_ContextList_out; -typedef class CORBA_ContextList *CORBA_ContextList_ptr; - -class CORBA_ConstructionPolicy; -class CORBA_ConstructionPolicy_var; -class CORBA_ConstructionPolicy_out; -typedef class CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr; - -class CORBA_AnySeq; -class CORBA_AnySeq_var; -class CORBA_AnySeq_out; -typedef class CORBA_AnySeq *CORBA_AnySeq_ptr; - -// Forward declarations. -class CORBA_NameValuePairSeq; -class CORBA_NameValuePairSeq_var; -class CORBA_NameValuePairSeq_out; -typedef CORBA_NameValuePairSeq *CORBA_NameValuePairSeq_ptr; - -#endif /* ! TAO_HAS_MINIMUM_CORBA */ - class CORBA_ORB; class CORBA_ORB_var; class CORBA_ORB_out; @@ -215,6 +160,16 @@ class CORBA_Object_var; class CORBA_Object_out; typedef class CORBA_Object *CORBA_Object_ptr; +class CORBA_Policy; +class CORBA_Policy_var; +class CORBA_Policy_out; +typedef class CORBA_Policy *CORBA_Policy_ptr; + +class CORBA_PolicyList; +class CORBA_PolicyList_var; +class CORBA_PolicyList_out; +typedef class CORBA_PolicyList *CORBA_PolicyList_ptr; + class CORBA_Current; class CORBA_Current_var; class CORBA_Current_out; @@ -224,105 +179,24 @@ class CORBA_ServerRequest; typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr; class CORBA_Environment; -class CORBA_Environment_var; -class CORBA_Environment_out; typedef class CORBA_Environment *CORBA_Environment_ptr; -// = Service Forward declaration -struct CORBA_ServiceDetail; -class CORBA_ServiceDetail_var; -class CORBA_ServiceDetail_out; -typedef CORBA_ServiceDetail * CORBA_ServiceDetail_ptr; - -struct CORBA_ServiceInformation; -class CORBA_ServiceInformation_var; -class CORBA_ServiceInformation_out; -typedef CORBA_ServiceInformation * CORBA_ServiceInformation_ptr; - class CORBA_Principal; typedef class CORBA_Principal *CORBA_Principal_ptr; typedef class CORBA_ImplementationDef *CORBA_ImplementationDef_ptr; -class CORBA_InterfaceDef; -class CORBA_InterfaceDef_var; -class CORBA_InterfaceDef_out; typedef class CORBA_InterfaceDef *CORBA_InterfaceDef_ptr; -#ifdef TAO_HAS_VALUETYPE -class CORBA_ValueBase; -class CORBA_ValueFactoryBase; -typedef CORBA_ValueFactoryBase *CORBA_ValueFactory_ptr; -class CORBA_DefaultValueRefCountBase; -#endif /* TAO_HAS_VALUETYPE */ - class CORBA_String_var; class CORBA_String_out; -class CORBA_WString_var; -class CORBA_WString_out; class CORBA_ExceptionList; -class CORBA_PolicyError; -typedef CORBA_PolicyError *CORBA_PolicyError_ptr; - -class CORBA_InvalidPolicies; -typedef CORBA_InvalidPolicies* CORBA_InvalidPolicies_ptr; - -class CORBA_PolicyTypeSeq; -class CORBA_PolicyTypeSeq_var; -class CORBA_PolicyTypeSeq_out; - -class CORBA_PolicyManager; -typedef CORBA_PolicyManager *CORBA_PolicyManager_ptr; - -class CORBA_PolicyCurrent; -typedef CORBA_PolicyCurrent *CORBA_PolicyCurrent_ptr; - -class CORBA_Policy; -class CORBA_Policy_var; -class CORBA_Policy_out; -typedef CORBA_Policy *CORBA_Policy_ptr; - -class CORBA_PolicyList; -class CORBA_PolicyList_var; -class CORBA_PolicyList_out; -typedef CORBA_PolicyList *CORBA_PolicyList_ptr; - -class CORBA_DomainManager; -class CORBA_DomainManager_var; -class CORBA_DomainManager_out; -typedef CORBA_DomainManager *CORBA_DomainManager_ptr; - -class CORBA_DomainManagerList; -class CORBA_DomainManagerList_var; -class CORBA_DomainManagerList_out; -typedef CORBA_DomainManagerList *CORBA_DomainManagerList_ptr; - -class CORBA_PollableSet; -class CORBA_PollableSet_var; -class CORBA_PollableSet_out; -typedef CORBA_PollableSet *CORBA_PollableSet_ptr; - -class CORBA_Pollable; -class CORBA_Pollable_var; -class CORBA_Pollable_out; -typedef CORBA_Pollable *CORBA_Pollable_ptr; - -class CORBA_DIIPollable; -class CORBA_DIIPollable_var; -class CORBA_DIIPollable_out; -typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr; - class TAO_InputCDR; class TAO_OutputCDR; -// @@ TODO This should be TAO_TAO_Stub -class TAO_Stub; - -class CORBA_ORB_ObjectIdList; -class CORBA_ORB_ObjectIdList_var; -class CORBA_ORB_ObjectIdList_out; -typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr; +// @@ TODO This should be TAO_STUB_Object +class STUB_Object; // enum values defined in tao/NVList.h, bitwise ORed. typedef u_int CORBA_Flags; @@ -338,6 +212,9 @@ typedef void (*TAO_Skeleton)( template <class T> class TAO_Unbounded_Sequence; template <class T> class TAO_Unbounded_Object_Sequence; +class CORBA_String_var; +class CORBA_String_out; + class TAO_Export CORBA { // = TITLE @@ -348,72 +225,72 @@ class TAO_Export CORBA // for all standard types Foo. public: - typedef ACE_CDR::Boolean Boolean; + typedef CDR::Boolean Boolean; typedef Boolean &Boolean_out; // Out type for boolean. // This and the other CORBA IDL types below are // typedef'd to the corresponding CDR types // already defined in ACE. - typedef ACE_CDR::Octet Octet; + typedef CDR::Octet Octet; typedef Octet &Octet_out; - typedef ACE_CDR::Short Short; + typedef CDR::Short Short; typedef Short &Short_out; - typedef ACE_CDR::UShort UShort; + typedef CDR::UShort UShort; typedef UShort &UShort_out; - typedef ACE_CDR::Long Long; + typedef CDR::Long Long; typedef Long &Long_out; - typedef ACE_CDR::ULong ULong; + typedef CDR::ULong ULong; typedef ULong &ULong_out; - typedef ACE_CDR::LongLong LongLong; + typedef CDR::LongLong LongLong; typedef LongLong &LongLong_out; - typedef ACE_CDR::ULongLong ULongLong; + typedef CDR::ULongLong ULongLong; typedef ULongLong &ULongLong_out; - typedef ACE_CDR::Float Float; + typedef CDR::Float Float; typedef Float &Float_out; - typedef ACE_CDR::Double Double; + typedef CDR::Double Double; typedef Double &Double_out; - typedef ACE_CDR::LongDouble LongDouble; + typedef CDR::LongDouble LongDouble; typedef LongDouble &LongDouble_out; - typedef ACE_CDR::Char Char; + typedef CDR::Char Char; typedef Char &Char_out; typedef Char *String; // = String memory management. - static Char* string_alloc (ULong len); - static Char* string_dup (const Char *); + static String string_alloc (ULong len); + static String string_copy (const Char *); + static String string_dup (const Char *); static void string_free (Char *); - // This is a TAO extension and must go away.... - static Char* string_copy (const Char *); + + typedef TAO_Unbounded_Sequence<Octet> OctetSeq; typedef CORBA_String_var String_var; typedef CORBA_String_out String_out; - // WChar was standarized in CORBA 2.2, but is still a bit unstable. + // WChar is an IDL extension, not yet standard. We use 32 bits + // because that's what many platforms use for their native wchar_t. + + typedef CDR::WChar WChar; + typedef WChar *WString; - typedef ACE_CDR::WChar WChar; typedef WChar &WChar_out; // Out type for WChar. // = String memory management routines. - static WChar* wstring_alloc (ULong len); - static WChar* wstring_dup (const WChar *const); + static WString wstring_alloc (ULong len); + static WString wstring_copy (const WChar *const); + static WString wstring_dup (const WChar *const); static void wstring_free (WChar *const); - typedef CORBA_WString_var WString_var; - typedef CORBA_WString_out WString_out; - - typedef TAO_Unbounded_Sequence<Octet> OctetSeq; - // = various CORBA defined classes. typedef CORBA_Any Any; typedef CORBA_Any_var Any_var; @@ -421,8 +298,6 @@ public: typedef Any *Any_ptr; typedef CORBA_Environment Environment; - typedef CORBA_Environment_var Environment_var; - typedef CORBA_Environment_out Environment_out; typedef Environment *Environment_ptr; typedef CORBA_Exception Exception; @@ -430,13 +305,6 @@ public: typedef CORBA_SystemException SystemException; typedef CORBA_UserException UserException; -#if !defined (TAO_HAS_MINIMUM_CORBA) - - typedef CORBA_Request Request; - typedef Request *Request_ptr; - typedef CORBA_Request_var Request_var; - typedef CORBA_Request_out Request_out; - typedef CORBA_NamedValue NamedValue; typedef NamedValue *NamedValue_ptr; typedef CORBA_NamedValue_var NamedValue_var; @@ -447,22 +315,6 @@ public: typedef CORBA_NVList_var NVList_var; typedef CORBA_NVList_out NVList_out; - typedef CORBA_Context Context; - typedef CORBA_Context *Context_ptr; - typedef CORBA_Context_var Context_var; - typedef CORBA_Context_out Context_out; - - typedef CORBA_ContextList ContextList; - typedef CORBA_ContextList *ContextList_ptr; - typedef CORBA_ContextList_var ContextList_var; - typedef CORBA_ContextList_out ContextList_out; - - typedef char *CORBA_FieldName; - typedef CORBA_String_var CORBA_FieldName_var; - typedef CORBA_String_out CORBA_FieldName_out; - -#endif /* TAO_HAS_MINIMUM_CORBA */ - typedef CORBA_Object Object; typedef CORBA_Object *Object_ptr; typedef CORBA_Object_var Object_var; @@ -476,6 +328,11 @@ public: typedef CORBA_ORB_var ORB_var; typedef CORBA_ORB_out ORB_out; + typedef CORBA_Request Request; + typedef Request *Request_ptr; + typedef CORBA_Request_var Request_var; + typedef CORBA_Request_out Request_out; + typedef CORBA_ServerRequest ServerRequest; typedef ServerRequest *ServerRequest_ptr; @@ -486,33 +343,26 @@ public: typedef CORBA_TypeCode_out TypeCode_out; typedef CORBA_ExceptionList ExceptionList; - typedef CORBA_ExceptionList_var ExceptionList_var; typedef CORBA_ExceptionList *ExceptionList_ptr; typedef CORBA_ImplementationDef *ImplementationDef_ptr; - typedef CORBA_InterfaceDef InterfaceDef; - typedef CORBA_InterfaceDef *InterfaceDef_ptr; - typedef CORBA_InterfaceDef_var InterfaceDef_var; - typedef CORBA_InterfaceDef_out InterfaceDef_out; + typedef class CORBA_InterfaceDef *InterfaceDef_ptr; + + typedef CORBA_Policy Policy; + typedef CORBA_Policy *Policy_ptr; + typedef CORBA_Policy_var Policy_var; + typedef CORBA_Policy_out Policy_out; + + typedef CORBA_PolicyList PolicyList; + typedef CORBA_PolicyList_var PolicyList_var; + typedef CORBA_PolicyList_out PolicyList_out; typedef CORBA_Current Current; typedef CORBA_Current *Current_ptr; typedef CORBA_Current_var Current_var; typedef CORBA_Current_out Current_out; -#ifdef TAO_HAS_VALUETYPE - typedef CORBA_ValueBase ValueBase; - typedef CORBA_ValueFactoryBase ValueFactoryBase; - typedef CORBA_ValueFactoryBase *ValueFactory; - // as CORBA 2.3a C++ map. 20.17.10 says - typedef CORBA_ValueFactoryBase *ValueFactory_ptr; - // own invention, more readable - typedef CORBA_DefaultValueRefCountBase DefaultValueRefCountBase; - static void add_ref (ValueBase *); - static void remove_ref (ValueBase *); -#endif /* TAO_HAS_VALUETYPE */ - // enum values defined in nvlist.hh, bitwise ORed. typedef u_int Flags; @@ -525,7 +375,7 @@ public: COMPLETED_MAYBE // can't say what happened; retry unsafe }; - enum exception_type + enum ExceptionType { // = Exception type. @@ -534,8 +384,6 @@ public: SYSTEM_EXCEPTION }; - CORBA::TypeCode_ptr _tc_exception_type; - // all the system exception classes #define TAO_SYSTEM_EXCEPTION(name) \ typedef CORBA_ ## name name @@ -547,37 +395,27 @@ TAO_SYSTEM_EXCEPTION_LIST // = all the CORBA::is_nil methods. static Boolean is_nil (Object_ptr); static Boolean is_nil (Environment_ptr); + static Boolean is_nil (NamedValue_ptr); + static Boolean is_nil (NVList_ptr); + static Boolean is_nil (Request_ptr); + // static Boolean is_nil (Context_ptr); static Boolean is_nil (TypeCode_ptr); static Boolean is_nil (ORB_ptr); static Boolean is_nil (Principal_ptr); static Boolean is_nil (ServerRequest_ptr req); -#if !defined (TAO_HAS_MINIMUM_CORBA) - - static Boolean is_nil (Request_ptr); - static Boolean is_nil (NamedValue_ptr); - static Boolean is_nil (NVList_ptr); - static Boolean is_nil (Context_ptr); - -#endif /* TAO_HAS_MINIMUM_CORBA */ - // = all the CORBA release methods. static void release (Object_ptr); static void release (Environment_ptr); + static void release (NamedValue_ptr); + static void release (NVList_ptr); + static void release (Request_ptr); static void release (Principal_ptr); + // static Boolean release (Context_ptr); static void release (TypeCode_ptr); static void release (ORB_ptr); static void release (ServerRequest_ptr req); -#if !defined (TAO_HAS_MINIMUM_CORBA) - - static void release (Request_ptr); - static void release (NamedValue_ptr); - static void release (NVList_ptr); - static void release (Context_ptr); - -#endif /* TAO_HAS_MINIMUM_CORBA */ - enum TCKind { // = Kinds of typecodes. @@ -657,206 +495,16 @@ TAO_SYSTEM_EXCEPTION_LIST static TypeCode_ptr _tc_UnknownUserException; - static CORBA::TypeCode_ptr _tc_Current; - -#if !defined (TAO_HAS_MINIMUM_CORBA) - static CORBA::TypeCode_ptr _tc_NamedValue; -#endif /* End of Minimum CORBA */ - enum - { - // = Flags for NVList add methods - ARG_IN = 0x01, - ARG_OUT = 0x02, - ARG_INOUT = 0x04, - IN_COPY_VALUE = 0x08, - OUT_LIST_MEMORY = 0x10, - DEPENDENT_LIST = 0x20, - - // = Flags for Context methods - CTX_RESTRICT_SCOPE = 0x40, - CTX_DELETE_DESCENDENTS = 0x80, - - // = Flags for deferred synchronous methods - INV_NO_RESPONSE = 0x100, - INV_TERM_ON_ERR = 0x200, - RESP_NO_WAIT = 0x400 - }; - - typedef char *ORBid; - typedef CORBA::String_var ORBid_var; - typedef CORBA::String_out ORBid_out; - static CORBA::TypeCode_ptr _tc_ORBid; - - typedef char *Identifier; - typedef CORBA::String_var Identifier_var; - typedef CORBA::String_out Identifier_out; - static CORBA::TypeCode_ptr _tc_Identifier; - - typedef char *RepositoryId; - typedef CORBA::String_var RepositoryId_var; - typedef CORBA::String_out RepositoryId_out; - static CORBA::TypeCode_ptr _tc_RepositoryId; - - typedef CORBA::Short PolicyErrorCode; - typedef CORBA::Short_out PolicyErrorCode_out; - static CORBA::TypeCode_ptr _tc_PolicyErrorCode; - - static const PolicyErrorCode BAD_POLICY; - static const PolicyErrorCode UNSUPPORTED_POLICY; - static const PolicyErrorCode BAD_POLICY_TYPE; - static const PolicyErrorCode BAD_POLICY_VALUE; - static const PolicyErrorCode UNSUPPORTED_POLICY_VALUE; - - typedef CORBA_PolicyError PolicyError; - typedef CORBA_PolicyError *PolicyError_ptr; - static CORBA::TypeCode_ptr _tc_PolicyError; - - typedef CORBA_InvalidPolicies InvalidPolicies; - typedef CORBA_InvalidPolicies* InvalidPolicies_ptr; - static CORBA::TypeCode_ptr _tc_InvalidPolicies; - - typedef CORBA::ULong PolicyType; - typedef CORBA::ULong_out PolicyType_out; - static CORBA::TypeCode_ptr _tc_PolicyType; - - typedef CORBA_Policy Policy; - typedef CORBA_Policy *Policy_ptr; - typedef CORBA_Policy_var Policy_var; - typedef CORBA_Policy_out Policy_out; static CORBA::TypeCode_ptr _tc_Policy; - - typedef CORBA_PolicyList PolicyList; - typedef CORBA_PolicyList_var PolicyList_var; - typedef CORBA_PolicyList_out PolicyList_out; static CORBA::TypeCode_ptr _tc_PolicyList; - // = Service definitions - typedef CORBA::UShort ServiceType; - typedef ServiceType CORBA_ServiceType; - typedef CORBA::UShort_out ServiceType_out; - typedef ServiceType_out CORBA_ServiceType_out; - static CORBA::TypeCode_ptr _tc_ServiceType; - static const ServiceType Security; - - typedef CORBA::ULong ServiceOption; - typedef ServiceOption CORBA_ServiceOption; - typedef CORBA::ULong_out ServiceOption_out; - typedef ServiceOption_out CORBA_ServiceOption_out; - static CORBA::TypeCode_ptr _tc_ServiceOption; - - typedef CORBA::ULong ServiceDetailType; - typedef ServiceDetailType CORBA_ServiceDetailType; - typedef CORBA::ULong_out ServiceDetailType_out; - typedef ServiceDetailType_out CORBA_ServiceDetailType_out; - static CORBA::TypeCode_ptr _tc_ServiceDetailType; - - typedef CORBA_ServiceDetail ServiceDetail; - typedef CORBA_ServiceDetail_var ServiceDetail_var; - typedef CORBA_ServiceDetail_out ServiceDetail_out; - typedef CORBA_ServiceDetail *ServiceDetail_ptr; - static CORBA::TypeCode_ptr _tc_ServiceDetail; - - typedef CORBA_ServiceInformation ServiceInformation; - typedef CORBA_ServiceInformation_var ServiceInformation_var; - typedef CORBA_ServiceInformation_out ServiceInformation_out; - typedef CORBA_ServiceInformation *ServiceInformation_ptr; - static CORBA::TypeCode_ptr _tc_ServiceInformation; - - typedef CORBA_PolicyTypeSeq PolicyTypeSeq; - typedef CORBA_PolicyTypeSeq_var PolicyTypeSeq_var; - typedef CORBA_PolicyTypeSeq_out PolicyTypeSeq_out; - static CORBA::TypeCode_ptr _tc_PolicyTypeSeq; - - enum SetOverrideType - { - SET_OVERRIDE, - ADD_OVERRIDE - }; - typedef SetOverrideType &SetOverrideType_out; - static CORBA::TypeCode_ptr _tc_SetOverrideType; - - typedef CORBA_PolicyManager PolicyManager; - typedef CORBA_PolicyManager *PolicyManager_ptr; - static CORBA::TypeCode_ptr _tc_PolicyManager; - - typedef CORBA_PolicyCurrent PolicyCurrent; - typedef CORBA_PolicyCurrent *PolicyCurrent_ptr; - static CORBA::TypeCode_ptr _tc_PolicyCurrent; - - typedef CORBA_DomainManager DomainManager; - typedef CORBA_DomainManager *DomainManager_ptr; - typedef CORBA_DomainManager_var DomainManager_var; - typedef CORBA_DomainManager_out DomainManager_out; - static CORBA::TypeCode_ptr _tc_DomainManager; - - typedef CORBA_DomainManagerList DomainManagerList; - typedef CORBA_DomainManagerList *DomainManagerList_ptr; - typedef CORBA_DomainManagerList_var DomainManagerList_var; - typedef CORBA_DomainManagerList_out DomainManagerList_out; - static CORBA::TypeCode_ptr _tc_DomainManagerList; - - static const PolicyType SecConstruction; - -#if ! defined (TAO_HAS_MINIMUM_CORBA) - typedef CORBA_ConstructionPolicy ConstructionPolicy; - typedef CORBA_ConstructionPolicy *ConstructionPolicy_ptr; - typedef CORBA_ConstructionPolicy_var ConstructionPolicy_var; - typedef CORBA_ConstructionPolicy_out ConstructionPolicy_out; - static CORBA::TypeCode_ptr _tc_ConstructionPolicy; - - typedef CORBA_WrongTransaction WrongTransaction; - typedef WrongTransaction *WrongTransaction_ptr; - static CORBA::TypeCode_ptr _tc_WrongTransaction; - - typedef CORBA_AnySeq AnySeq; - typedef CORBA_AnySeq *AnySeq_ptr; - typedef CORBA_AnySeq_var AnySeq_var; - typedef CORBA_AnySeq_out AnySeq_out; - static CORBA::TypeCode_ptr _tc_AnySeq; - - typedef CORBA_FieldName FieldName; - typedef CORBA_FieldName_var FieldName_var; - typedef CORBA_FieldName_out FieldName_out; - static CORBA::TypeCode_ptr _tc_FieldName; - - typedef CORBA_NameValuePair NameValuePair; - typedef CORBA_NameValuePair *NameValuePair_ptr; - typedef CORBA_NameValuePair_var NameValuePair_var; - typedef CORBA_NameValuePair_out NameValuePair_out; - static CORBA::TypeCode_ptr _tc_NameValuePair; - - typedef CORBA_NameValuePairSeq NameValuePairSeq; - typedef CORBA_NameValuePairSeq *NameValuePairSeq_ptr; - typedef CORBA_NameValuePairSeq_var NameValuePairSeq_var; - typedef CORBA_NameValuePairSeq_out NameValuePairSeq_out; - static CORBA::TypeCode_ptr _tc_NameValuePairSeq; - -#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */ - - // **************************************************************** - - typedef CORBA_PollableSet PollableSet; - typedef CORBA_PollableSet_var PollableSet_var; - typedef CORBA_PollableSet_out PollableSet_out; - typedef CORBA_PollableSet_ptr PollableSet_ptr; - static CORBA::TypeCode_ptr _tc_PollableSet; - - typedef CORBA_Pollable Pollable; - typedef CORBA_Pollable_var Pollable_var; - typedef CORBA_Pollable_out Pollable_out; - typedef CORBA_Pollable_ptr Pollable_ptr; - static CORBA::TypeCode_ptr _tc_Pollable; - - typedef CORBA_DIIPollable DIIPollable; - typedef CORBA_DIIPollable_var DIIPollable_var; - typedef CORBA_DIIPollable_out DIIPollable_out; - typedef CORBA_DIIPollable_ptr DIIPollable_ptr; - static CORBA::TypeCode_ptr _tc_DIIPollable; - - // **************************************************************** + static CORBA::TypeCode_ptr _tc_Current; + + static CORBA_Environment& default_environment (void); + // Obtain the thread-specific default environment. // There could be a single version of these methods, but g++ 2.7.2 - // gets horribly confused if we used CORBA::default_environment() at + // gets horribly confused if we used CORBA::default_environment() at // this point. static ORB_ptr ORB_init (int &argc, char *const *argv, @@ -867,11 +515,6 @@ TAO_SYSTEM_EXCEPTION_LIST CORBA_Environment &TAO_IN_ENV); // ORB initialisation - // = TAO extensions... - - static CORBA_Environment& default_environment (void); - // Obtain the thread-specific default environment. - // = The following two methods are TAO-specific extensions. static ORB_ptr instance (void); // Returns a pointer to the "default ORB." @@ -879,17 +522,37 @@ TAO_SYSTEM_EXCEPTION_LIST static void instance (ORB_ptr); // Sets a pointer to the "default ORB." + enum + { + // = Define flags for NVList add methods + + ARG_IN = 0x01, + ARG_OUT = 0x02, + ARG_INOUT = 0x04, + IN_COPY_VALUE = 0x08, + OUT_LIST_MEMORY = 0x10 + }; + + typedef char *Identifier; + typedef CORBA::String_var Identifier_var; + typedef CORBA::String_out Identifier_out; + static CORBA::TypeCode_ptr _tc_Identifier; + + typedef char *RepositoryId; + typedef CORBA::String_var RepositoryId_var; + typedef CORBA::String_out RepositoryId_out; + static CORBA::TypeCode_ptr _tc_RepositoryId; + + typedef CORBA::ULong PolicyType; + typedef CORBA::ULong_out PolicyType_out; + static CORBA::TypeCode_ptr _tc_PolicyType; + private: friend class CORBA_ORB; static ORB_ptr instance_; // Points to the "default ORB." }; // end of class (namespace) CORBA -// **************************************************************** - -// A helper clas to handle the various kinds of octet sequences used -// inside the ORB. - typedef TAO_Unbounded_Sequence<CORBA::Octet> TAO_opaque; extern TAO_Export CORBA::TypeCode_ptr TC_opaque; @@ -904,8 +567,4 @@ class TAO_ObjectKey_var; class TAO_ObjectKey_out; typedef TAO_ObjectKey *TAO_ObjectKey_ptr; -#if defined (__ACE_INLINE__) -# include "tao/corbafwd.i" -#endif /* ! __ACE_INLINE__ */ - #endif /* TAO_CORBAFWD_H */ |