diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-19 16:35:23 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-19 16:35:23 +0000 |
| commit | fb437956a2fb1d879908142ea0a3ef03e7abc1e1 (patch) | |
| tree | 0558d344d19272f3a1edfc59970ff0a3d5785428 | |
| parent | 925b748c08bf95400dd3b34ece2f98a36ee3d4bb (diff) | |
| download | ATCD-fb437956a2fb1d879908142ea0a3ef03e7abc1e1.tar.gz | |
ChangeLogTag: Fri Sep 19 11:34:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
78 files changed, 868 insertions, 1015 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index 848fe7a072a..24d4973d292 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,100 @@ +Fri Sep 19 11:34:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Adapter.cpp: + * tao/Any.h: + * tao/Any_Impl.h: + * tao/Any_Impl_T.h: + * tao/Asynch_Queued_Message.cpp: + * tao/Asynch_Queued_Message.h: + * tao/Asynch_Reply_Dispatcher_Base.cpp: + * tao/Base_Transport_Property.cpp: + * tao/Basic_Argument_T.h: + * tao/Basic_Arguments.h: + * tao/Basic_SArgument_T.h: + * tao/Basic_SArguments.h: + * tao/Connector_Registry.cpp: + * tao/Connector_Registry.h: + * tao/Endpoint.cpp: + * tao/Endpoint.h: + * tao/Endpoint_Selector_Factory.cpp: + * tao/Endpoint_Selector_Factory.h: + * tao/Environment.cpp: + * tao/Environment.h: + * tao/Exception.cpp: + * tao/Exclusive_TMS.cpp: + * tao/Exclusive_TMS.h: + * tao/FILE_Parser.cpp: + * tao/FILE_Parser.h: + * tao/Fault_Tolerance_Service.cpp: + * tao/Fault_Tolerance_Service.h: + * tao/Flushing_Strategy.cpp: + * tao/GIOPC.cpp: + * tao/GIOPC.h: + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Base.h: + * tao/GIOP_Message_Generator_Parser.cpp: + * tao/GIOP_Message_Generator_Parser.h: + * tao/GIOP_Message_Generator_Parser_10.cpp: + * tao/GIOP_Message_Generator_Parser_10.h: + * tao/GIOP_Message_Generator_Parser_11.cpp: + * tao/GIOP_Message_Generator_Parser_11.h: + * tao/GIOP_Message_Generator_Parser_12.cpp: + * tao/GIOP_Message_Generator_Parser_12.h: + * tao/GIOP_Message_Generator_Parser_Impl.cpp: + * tao/GIOP_Message_Generator_Parser_Impl.h: + * tao/GIOP_Message_Lite.cpp: + * tao/GIOP_Message_Lite.h: + * tao/GIOP_Message_Locate_Header.cpp: + * tao/GIOP_Message_Locate_Header.h: + * tao/GIOP_Message_State.cpp: + * tao/GIOP_Message_State.h: + * tao/GIOP_Message_Version.cpp: + * tao/GIOP_Message_Version.h: + * tao/GIOP_Utils.h: + * tao/IFR_Client_Adapter.h: + * tao/IIOP_Acceptor.cpp: + * tao/IIOP_Acceptor.h: + * tao/IIOP_Connection_Handler.cpp: + * tao/IIOP_Connection_Handler.h: + * tao/IIOP_Connector.cpp: + * tao/IIOP_Connector.h: + * tao/IIOP_Endpoint.cpp: + * tao/IIOP_Endpoint.h: + * tao/NVList.h: + * tao/Object.h: + * tao/RTCORBA/RT_Endpoint_Selector_Factory.h: + + Cleanup of #include structure. + + * tao/IIOP_EndpointsC.cpp: + * tao/IIOP_EndpointsC.h: + * tao/IIOP_EndpointsC.inl: + * tao/IIOP_Endpoints.pidl: + + New files, replacing the four below. + + * tao/iiop_endpoints.cpp: + * tao/iiop_endpoints.h: + * tao/iiop_endpoints.i: + * tao/iiop_endpoints.pidl: + + Removed these files, replaced with the new ones above. + + * tao/Strategies/DIOP_Profile.cpp: + * tao/Strategies/SHMIOP_Profile.cpp: + * tao/IIOP_Profile.cpp: + + Updated these files with the new #include name and new + class name resulting from the file replacement above. + + * tao/Makefile.bor: + * tao/Makefile.tao: + * tao/TAO.dsp: + * tao/TAO_Static.dsp: + * tao/tao.mpc: + + Updated with the new filenames. + Thu Sep 18 21:00:50 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_arg_traits.cpp (visit_sequence): diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index 47f281bc0fe..6806b12adab 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -1,9 +1,10 @@ // $Id$ #include "Adapter.h" #include "Object.h" -#include "ace/Dynamic_Service.h" #include "debug.h" +#include "ace/Dynamic_Service.h" + #if !defined (__ACE_INLINE__) # include "Adapter.i" #endif /* __ACE_INLINE__ */ @@ -139,7 +140,7 @@ TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key, int r = this->adapters_[i]->dispatch (key, request, forward_to - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (r != TAO_Adapter::DS_MISMATCHED_KEY) diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index 9b566b2d5c6..029b50cb8d5 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -13,7 +13,6 @@ #define TAO_ANY_H #include /**/ "ace/pre.h" - #include "ace/CDR_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Any_Impl.h b/TAO/tao/Any_Impl.h index b637592f591..e376a7061aa 100644 --- a/TAO/tao/Any_Impl.h +++ b/TAO/tao/Any_Impl.h @@ -13,7 +13,6 @@ #define TAO_ANY_IMPL_H #include /**/ "ace/pre.h" - #include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Any_Impl_T.h b/TAO/tao/Any_Impl_T.h index 3737a5c2955..555e9a2431e 100644 --- a/TAO/tao/Any_Impl_T.h +++ b/TAO/tao/Any_Impl_T.h @@ -18,12 +18,10 @@ #include "tao/Any_Impl.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - namespace CORBA { class Any; diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 09d233cdde5..aa706565e59 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -1,15 +1,16 @@ #include "Asynch_Queued_Message.h" #include "debug.h" -#include "ace/Malloc_T.h" + +#include "ace/OS_Memory.h" +#include "ace/OS_String.h" +#include "ace/os_include/sys/os_uio.h" #include "ace/Log_Msg.h" #include "ace/Message_Block.h" - ACE_RCSID (tao, Asynch_Queued_Message, "$Id$") - TAO_Asynch_Queued_Message:: TAO_Asynch_Queued_Message (const ACE_Message_Block *contents, ACE_Allocator *alloc, @@ -26,9 +27,9 @@ TAO_Asynch_Queued_Message:: i != 0; i = i->cont ()) { - ACE_OS::memcpy (this->buffer_ + copy_offset, - i->rd_ptr (), - i->length ()); + ACE_OS_String::memcpy (this->buffer_ + copy_offset, + i->rd_ptr (), + i->length ()); copy_offset += i->length (); } } @@ -111,9 +112,9 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) char[sz], 0); - ACE_OS::memcpy (buf, - this->buffer_ + this->offset_, - sz); + ACE_OS_String::memcpy (buf, + this->buffer_ + this->offset_, + sz); TAO_Asynch_Queued_Message *qm = 0; diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h index 1d287b95092..a4ec0762931 100644 --- a/TAO/tao/Asynch_Queued_Message.h +++ b/TAO/tao/Asynch_Queued_Message.h @@ -12,9 +12,10 @@ #ifndef TAO_ASYNCH_QUEUED_MESSAGE_H #define TAO_ASYNCH_QUEUED_MESSAGE_H + #include /**/ "ace/pre.h" -#include "Queued_Message.h" +#include "tao/Queued_Message.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp index cf5caa20241..be1ca213b97 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp @@ -1,7 +1,6 @@ // $Id$ #include "tao/Asynch_Reply_Dispatcher_Base.h" - #include "tao/Pluggable_Messaging_Utils.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp index ab899851b10..8895392e0a3 100644 --- a/TAO/tao/Base_Transport_Property.cpp +++ b/TAO/tao/Base_Transport_Property.cpp @@ -3,13 +3,13 @@ #include "tao/Base_Transport_Property.h" #include "ace/OS_Memory.h" - #if !defined (__ACE_INLINE__) # include "tao/Base_Transport_Property.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tao, Base_Transport_Property, "$Id$") - +ACE_RCSID (tao, + Base_Transport_Property, + "$Id$") TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void) { diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 3ca14783390..d9643369e94 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -15,6 +15,7 @@ #define TAO_BASIC_ARGUMENT_T_H #include "ace/pre.h" + #include "tao/Argument.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h index 5043bb1a7ae..f067d25166e 100644 --- a/TAO/tao/Basic_Arguments.h +++ b/TAO/tao/Basic_Arguments.h @@ -15,6 +15,7 @@ #define TAO_BASIC_ARGUMENTS_H #include "ace/pre.h" + #include "tao/Basic_Argument_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Basic_SArgument_T.h b/TAO/tao/Basic_SArgument_T.h index 341ddf31243..50c686a91bb 100644 --- a/TAO/tao/Basic_SArgument_T.h +++ b/TAO/tao/Basic_SArgument_T.h @@ -15,6 +15,7 @@ #define TAO_BASIC_SARGUMENT_T_H #include "ace/pre.h" + #include "tao/Argument.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Basic_SArguments.h b/TAO/tao/Basic_SArguments.h index 0fcb8b1c9fa..6553c5476bd 100644 --- a/TAO/tao/Basic_SArguments.h +++ b/TAO/tao/Basic_SArguments.h @@ -12,6 +12,7 @@ #define TAO_BASIC_SARGUMENTS_H #include "ace/pre.h" + #include "tao/Basic_SArgument_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 7738cf58478..dd6fe4e660e 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -7,7 +7,6 @@ #include "Profile.h" #include "Transport_Connector.h" #include "Protocol_Factory.h" -#include "Environment.h" #include "debug.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 8c7f324d07c..87a2cc53b96 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -16,16 +16,13 @@ #define TAO_CONNECTOR_REGISTRY_H #include /**/ "ace/pre.h" - #include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "tao/Basic_Types.h" -#include "tao/orbconf.h" +#include "tao/Environment.h" // Forward declarations. class TAO_ORB_Core; diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp index 45fd6b652c8..63348e95eaa 100644 --- a/TAO/tao/Endpoint.cpp +++ b/TAO/tao/Endpoint.cpp @@ -6,7 +6,9 @@ #include "tao/Endpoint.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tao, Endpoint, "$Id$") +ACE_RCSID (tao, + Endpoint, + "$Id$") TAO_Endpoint::~TAO_Endpoint (void) diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index f9100dde9bf..742228935b0 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -15,16 +15,17 @@ #ifndef TAO_ENDPOINT_H #define TAO_ENDPOINT_H -#include /**/ "ace/pre.h" -#include "tao/corbafwd.h" -#include "tao/orbconf.h" +#include /**/ "ace/pre.h" +#include "ace/Thread_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Thread_Mutex.h" +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" +#include "tao/orbconf.h" /** * @class TAO_Endpoint diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp index 962ac11b382..eac24e2509a 100644 --- a/TAO/tao/Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Endpoint_Selector_Factory.cpp @@ -3,7 +3,9 @@ #include "tao/Endpoint_Selector_Factory.h" #include "ace/Dynamic_Service.h" -ACE_RCSID(tao, Endpoint_Selector_Factory, "$Id$") +ACE_RCSID (tao, + Endpoint_Selector_Factory, + "$Id$") TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void) { diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h index c142cf0481b..c64ce9a223c 100644 --- a/TAO/tao/Endpoint_Selector_Factory.h +++ b/TAO/tao/Endpoint_Selector_Factory.h @@ -16,16 +16,17 @@ #ifndef TAO_ENDPOINT_SELECTOR_FACTORY_H #define TAO_ENDPOINT_SELECTOR_FACTORY_H -#include /**/ "ace/pre.h" -#include "tao/corbafwd.h" +#include /**/ "ace/pre.h" +#include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" + +#include "tao/TAO_Export.h" class TAO_Invocation_Endpoint_Selector; diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index dd29666cc8f..f4a1165501d 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -6,12 +6,10 @@ # include "tao/Environment.i" #endif /* __ACE_INLINE__ */ - ACE_RCSID (tao, Environment, "$Id$") - CORBA::Environment::Environment (void) : exception_ (0) , previous_ (0) diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 01f25053ded..3e7aef18b09 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -19,27 +19,32 @@ #ifndef TAO_ENVIRONMENT_H #define TAO_ENVIRONMENT_H -#include /**/ "ace/pre.h" -#include "tao/corbafwd.h" +#include /**/ "ace/pre.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <stdarg.h> // LynxOS requires this before stdio.h -#include <stdio.h> // Pull in "stdout" definition. - +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" +#include "tao/orbconf.h" #include "tao/Pseudo_VarOut_T.h" class TAO_ORB_Core; namespace CORBA { + class Exception; + class Environment; + typedef Environment *Environment_ptr; typedef TAO_Pseudo_Var_T<Environment> Environment_var; typedef TAO_Pseudo_Out_T<Environment, Environment_var> Environment_out; + TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr); + TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr); + /** * @class Environment * diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 7edc08c3043..5213f515cd9 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -4,18 +4,13 @@ // on all of these data structures. #include "Exception.h" -#include "Typecode.h" #include "Environment.h" -#include "Any.h" -#include "CDR.h" #include "Any_SystemException.h" -#include "CORBA_String.h" #include "Any_Dual_Impl_T.h" #include "ace/Malloc.h" #include "ace/SString.h" #include "ace/streams.h" -#include "ace/Malloc.h" #if !defined (__ACE_INLINE__) # include "tao/Exception.i" diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index 4c55ce39ca8..f2d7edfe627 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -2,11 +2,12 @@ #include "tao/Exclusive_TMS.h" #include "tao/Reply_Dispatcher.h" -#include "tao/Pluggable_Messaging_Utils.h" #include "tao/debug.h" #include "Transport.h" -ACE_RCSID(tao, Exclusive_TMS, "$Id$") +ACE_RCSID (tao, + Exclusive_TMS, + "$Id$") TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport), diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h index 1d00625373a..6937340cb4c 100644 --- a/TAO/tao/Exclusive_TMS.h +++ b/TAO/tao/Exclusive_TMS.h @@ -13,6 +13,7 @@ #ifndef TAO_EXCLUSIVE_TMS_H #define TAO_EXCLUSIVE_TMS_H + #include /**/ "ace/pre.h" #include "tao/Transport_Mux_Strategy.h" diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index 8b0fe141eb4..dec7dee9db7 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -1,19 +1,18 @@ // $Id$ #include "FILE_Parser.h" -#include "tao/Object_Loader.h" -#include "tao/Object.h" #include "tao/ORB.h" -#include "tao/Exception.h" #include "tao/Environment.h" + #include "ace/Read_Buffer.h" -#include "ace/Malloc_Base.h" #if !defined(__ACE_INLINE__) #include "FILE_Parser.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tao, FILE_Parser, "$Id$") +ACE_RCSID (tao, + FILE_Parser, + "$Id$") TAO_FILE_Parser::~TAO_FILE_Parser (void) { @@ -40,7 +39,8 @@ TAO_FILE_Parser::parse_string (const char *ior, const char *filename = ior + sizeof (::file_prefix)+1; - FILE* file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_LIB_TEXT("r")); + FILE* file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR (filename), + ACE_LIB_TEXT("r")); if (file == 0) return CORBA::Object::_nil (); diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h index 4d0a4d420ea..480fb653d18 100644 --- a/TAO/tao/FILE_Parser.h +++ b/TAO/tao/FILE_Parser.h @@ -12,15 +12,16 @@ #ifndef TAO_FILE_PARSER_H #define TAO_FILE_PARSER_H -#include /**/ "ace/pre.h" -#include "tao/IOR_Parser.h" +#include /**/ "ace/pre.h" #include "ace/Service_Config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/IOR_Parser.h" + /** * @class TAO_FILE_Parser * diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp index dfd5b73d20f..c57622f4250 100644 --- a/TAO/tao/Fault_Tolerance_Service.cpp +++ b/TAO/tao/Fault_Tolerance_Service.cpp @@ -1,10 +1,9 @@ #include "tao/Fault_Tolerance_Service.h" -#include "tao/Service_Callbacks.h" -#include "ace/Dynamic_Service.h" #include "tao/Services_Activate.h" #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" -#include "ace/Lock.h" + +#include "ace/Dynamic_Service.h" #if !defined (__ACE_INLINE__) # include "tao/Fault_Tolerance_Service.i" @@ -14,7 +13,6 @@ ACE_RCSID (tao, Fault_Tolerance_Service, "$Id$") - TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void) { delete this->ft_service_callback_; diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index ec3a3fae1f8..ff8fd90b6a1 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -15,16 +15,16 @@ //============================================================================= #ifndef TAO_FAULT_TOLERANCE_SERVICE_H #define TAO_FAULT_TOLERANCE_SERVICE_H -#include /**/ "ace/pre.h" +#include /**/ "ace/pre.h" #include "ace/SString.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/corbafwd.h" +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" class ACE_Lock; class TAO_Service_Callbacks; diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp index 82a66ec1427..5d3e59a7e66 100644 --- a/TAO/tao/Flushing_Strategy.cpp +++ b/TAO/tao/Flushing_Strategy.cpp @@ -3,7 +3,9 @@ #include "Flushing_Strategy.h" -ACE_RCSID(tao, Flushing_Strategy, "$Id$") +ACE_RCSID (tao, + Flushing_Strategy, + "$Id$") TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void) { diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index fb800c04741..c1915fee9a9 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -31,7 +31,6 @@ #include "GIOPC.h" #include "Typecode.h" -#include "ace/OS.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index da41f8a52f1..adec7e21994 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -33,13 +33,12 @@ #include /**/ "ace/pre.h" -#include "tao/corbafwd.h" +#include "tao/IOP_IORC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IOP_IORC.h" #include "tao/VarOut_T.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 4de42df0a07..4a0e8bc4c4f 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -2,10 +2,8 @@ #include "GIOP_Message_Base.h" #include "operation_details.h" -#include "GIOP_Utils.h" #include "debug.h" #include "ORB_Core.h" -#include "Leader_Follower.h" #include "TAO_Server_Request.h" #include "GIOP_Message_Locate_Header.h" #include "Transport.h" @@ -17,8 +15,9 @@ # include "GIOP_Message_Base.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, GIOP_Message_Base, "$Id$") - +ACE_RCSID (tao, + GIOP_Message_Base, + "$Id$") TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, size_t /*input_cdr_size*/) diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index ecdd703506f..fa662c92dea 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -15,6 +15,7 @@ #define TAO_GIOP_MESSAGE_BASE_H #include /**/ "ace/pre.h" + #include "tao/Pluggable_Messaging.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -246,9 +247,6 @@ protected: TAO_OutputCDR out_stream_; }; - - - #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_Base.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index 677854932d5..f7cad45ccc5 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -1,10 +1,6 @@ #include "tao/GIOP_Message_Generator_Parser.h" #include "tao/Pluggable_Messaging_Utils.h" #include "tao/GIOP_Utils.h" -#include "tao/CDR.h" -#include "tao/Object_KeyC.h" -#include "tao/IOPC.h" -#include "tao/Tagged_Profile.h" #include "tao/debug.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index f782b614e2c..f66d1fd13d1 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -12,16 +12,15 @@ #ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_H #define TAO_GIOP_MESSAGE_GENERATOR_PARSER_H -#include /**/ "ace/pre.h" -#include "tao/corbafwd.h" +#include /**/ "ace/pre.h" +#include "ace/Global_Macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Exception.h" -#include "ace/Global_Macros.h" class TAO_Operation_Details; class TAO_Target_Specification; diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index 44ec07ef588..e31c75e7fad 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -2,18 +2,11 @@ #include "GIOP_Message_Generator_Parser_10.h" #include "GIOP_Utils.h" - #include "GIOP_Message_Locate_Header.h" - #include "operation_details.h" -#include "CDR.h" -#include "Any.h" #include "debug.h" -#include "OctetSeqC.h" #include "Pluggable_Messaging_Utils.h" #include "TAO_Server_Request.h" -#include "GIOP_Message_State.h" -#include "CORBA_String.h" #if !defined (__ACE_INLINE__) # include "GIOP_Message_Generator_Parser_10.inl" diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index de16bdc414a..94b82bae401 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -12,9 +12,10 @@ #ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H #define TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H + #include /**/ "ace/pre.h" -#include "tao/GIOP_Message_Generator_Parser.h" +#include "tao/GIOP_Message_Generator_Parser.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp index dd99bff0b75..0d9bd94c60a 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp @@ -1,7 +1,8 @@ #include "tao/GIOP_Message_Generator_Parser_11.h" - -ACE_RCSID(tao, GIOP_Message_Gen_Parser_11, "$Id$") +ACE_RCSID (tao, + GIOP_Message_Gen_Parser_11, + "$Id$") CORBA::Octet TAO_GIOP_Message_Generator_Parser_11::minor_version (void) diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h index fb2514cd6d4..3e88dff0e18 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h @@ -12,15 +12,15 @@ #ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H #define TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H + #include /**/ "ace/pre.h" -#include "tao/GIOP_Message_Generator_Parser_10.h" +#include "tao/GIOP_Message_Generator_Parser_10.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - /** * @class TAO_GIOP_Message_Generator_Parser_11 * @@ -41,7 +41,6 @@ public: }; - #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_Generator_Parser_11.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 5dac3aa38ab..069cda06d58 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -1,15 +1,11 @@ #include "GIOP_Message_Generator_Parser_12.h" #include "GIOP_Utils.h" -#include "GIOP_Message_State.h" #include "GIOP_Message_Locate_Header.h" #include "operation_details.h" -#include "CDR.h" -#include "Any.h" #include "debug.h" #include "Pluggable_Messaging_Utils.h" #include "TAO_Server_Request.h" #include "TAOC.h" -#include "Service_Context.h" #include "ORB_Core.h" #include "Transport.h" @@ -21,7 +17,6 @@ ACE_RCSID (tao, GIOP_Message_Gen_Parser_12, "$Id$") - // This is used by GIOP1.2. This is to align the message body on a // 8-octet boundary. This is declared static so that it is in file // scope. diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index 042edb41bd9..c1dfd27ef92 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -12,9 +12,10 @@ #ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H #define TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H + #include /**/ "ace/pre.h" -#include "tao/GIOP_Message_Generator_Parser.h" +#include "tao/GIOP_Message_Generator_Parser.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp b/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp index 39bcfecc737..37842a51970 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp @@ -1,9 +1,9 @@ #include "tao/GIOP_Message_Generator_Parser_Impl.h" - #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Generator_Parser_Impl.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID(tao, GIOP_Message_Generator_Parser_Impl, "$Id$") +ACE_RCSID (tao, + GIOP_Message_Generator_Parser_Impl, + "$Id$") diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h index 68ca7ef6ee8..26f1ffa364f 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h @@ -12,6 +12,7 @@ #ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_IMPL_H #define TAO_GIOP_MESSAGE_GENERATOR_PARSER_IMPL_H + #include /**/ "ace/pre.h" #include "tao/GIOP_Message_Generator_Parser_11.h" diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 7ef64234a54..ea5d8a47e13 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -6,12 +6,9 @@ #include "tao/debug.h" #include "tao/TAOC.h" #include "tao/ORB_Core.h" -#include "tao/GIOP_Utils.h" #include "tao/operation_details.h" #include "tao/TAO_Server_Request.h" #include "tao/GIOP_Message_Locate_Header.h" -#include "tao/target_specification.h" -#include "tao/Leader_Follower.h" #include "tao/LF_Strategy.h" #include "tao/Transport.h" #include "tao/Codeset_Manager.h" diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 9bf117f266b..bd33855f56c 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -23,14 +23,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/GIOP_Utils.h" -#include "tao/GIOP_Message_State.h" -#include "tao/CDR.h" class TAO_Operation_Details; class TAO_Pluggable_Reply_Params; class TAO_GIOP_Locate_Request_Header; class TAO_Queued_Data; class TAO_ServerRequest; +class TAO_GIOP_Message_Version; /** * @class TAO_GIOP_Message_Lite @@ -253,7 +252,7 @@ private: TAO_ORB_Core *orb_core_; /// The message type that we are going to process.. - CORBA::Octet message_type_; + CORBA::Octet message_type_; /// The pay load size CORBA::ULong message_size_; diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp index a7401ed5270..089da5d7a71 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.cpp +++ b/TAO/tao/GIOP_Message_Locate_Header.cpp @@ -5,4 +5,6 @@ # include "tao/GIOP_Message_Locate_Header.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tao, GIOP_Message_Headers, "$Id$") +ACE_RCSID (tao, + GIOP_Message_Headers, + "$Id$") diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h index 2f504e8ae86..89600c8ec1b 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.h +++ b/TAO/tao/GIOP_Message_Locate_Header.h @@ -16,16 +16,15 @@ #ifndef TAO_GIOP_MESSAGE_LOCATE_HEADER_H #define TAO_GIOP_MESSAGE_LOCATE_HEADER_H + #include /**/ "ace/pre.h" #include "tao/Tagged_Profile.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - /** * @class TAO_GIOP_Locate_Request_Header * diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp index 0b3f6694dbe..e3a3ca20bf3 100644 --- a/TAO/tao/GIOP_Message_State.cpp +++ b/TAO/tao/GIOP_Message_State.cpp @@ -1,7 +1,6 @@ // $Id$ #include "tao/GIOP_Message_State.h" -#include "tao/GIOP_Message_Generator_Parser_Impl.h" #include "tao/debug.h" #include "tao/GIOP_Message_Base.h" @@ -11,12 +10,10 @@ # include "tao/GIOP_Message_State.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID (tao, GIOP_Message_State, "$Id$") - TAO_GIOP_Message_State::TAO_GIOP_Message_State ( TAO_ORB_Core * /*orb_core*/, TAO_GIOP_Message_Base *base) diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index e95ffba562b..f902fa03a0e 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -16,19 +16,18 @@ //============================================================================= #ifndef TAO_GIOP_MESSAGE_STATE_H #define TAO_GIOP_MESSAGE_STATE_H + #include /**/ "ace/pre.h" -#include "tao/GIOP_Message_Version.h" +#include "tao/GIOP_Message_Version.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - class TAO_ORB_Core; class TAO_GIOP_Message_Base; - /** * @class TAO_GIOP_Message_State * diff --git a/TAO/tao/GIOP_Message_Version.cpp b/TAO/tao/GIOP_Message_Version.cpp index ce8b3f10d42..78a90520dcf 100644 --- a/TAO/tao/GIOP_Message_Version.cpp +++ b/TAO/tao/GIOP_Message_Version.cpp @@ -5,4 +5,6 @@ # include "tao/GIOP_Message_Version.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tao, GIOP_Message_Version, "$Id$") +ACE_RCSID (tao, + GIOP_Message_Version, + "$Id$") diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h index c9ae47838b0..edd11aae3bc 100644 --- a/TAO/tao/GIOP_Message_Version.h +++ b/TAO/tao/GIOP_Message_Version.h @@ -16,14 +16,17 @@ #ifndef TAO_GIOP_MESSAGE_VERSION_H #define TAO_GIOP_MESSAGE_VERSION_H + #include /**/ "ace/pre.h" -#include "tao/corbafwd.h" + +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - +#include "tao/Basic_Types.h" +#include "tao/orbconf.h" class TAO_ORB_Core; diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h index a89de26894c..b9485108afe 100644 --- a/TAO/tao/GIOP_Utils.h +++ b/TAO/tao/GIOP_Utils.h @@ -15,6 +15,7 @@ #ifndef TAO_GIOP_UTILS_H #define TAO_GIOP_UTILS_H + #include /**/ "ace/pre.h" #include "tao/Object.h" diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h index a13709b739c..fdd35299a23 100644 --- a/TAO/tao/IFR_Client_Adapter.h +++ b/TAO/tao/IFR_Client_Adapter.h @@ -13,21 +13,31 @@ #ifndef TAO_IFR_CLIENT_ADAPTER_H #define TAO_IFR_CLIENT_ADAPTER_H -#include /**/ "ace/pre.h" -#include "tao/corbafwd.h" +#include /**/ "ace/pre.h" +#include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" + +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" + +class TAO_OutputCDR; namespace CORBA { class InterfaceDef; typedef InterfaceDef *InterfaceDef_ptr; + + class Any; + class ORB; + typedef ORB *ORB_ptr; + class Object; + typedef Object *Object_ptr; }; /** diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 05c55776d35..e7f52d99413 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -4,16 +4,10 @@ #include "tao/IIOP_Acceptor.h" #include "tao/IIOP_Profile.h" #include "tao/MProfile.h" -#include "tao/ORB_Core.h" -#include "tao/Server_Strategy_Factory.h" #include "tao/debug.h" #include "tao/Protocols_Hooks.h" #include "tao/Codeset_Manager.h" #include "tao/Transport.h" -#include "Thread_Lane_Resources.h" -#include "Thread_Per_Connection_Handler.h" - -#include "ace/Auto_Ptr.h" #if !defined(__ACE_INLINE__) #include "tao/IIOP_Acceptor.i" diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index 5db382d380d..3c44a26467c 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -17,19 +17,19 @@ #ifndef TAO_IIOP_ACCEPTOR_H #define TAO_IIOP_ACCEPTOR_H -#include /**/ "ace/pre.h" -#include "tao/Transport_Acceptor.h" +#include /**/ "ace/pre.h" +#include "ace/Acceptor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SOCK_Acceptor.h" + +#include "tao/Transport_Acceptor.h" #include "tao/IIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" - -#include "ace/Acceptor.h" -#include "ace/SOCK_Acceptor.h" #include "tao/GIOP_Message_Version.h" // TAO IIOP_Acceptor concrete call defination diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 07344f37a88..20ac7798b25 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -1,16 +1,10 @@ #include "tao/IIOP_Connection_Handler.h" -#include "tao/Timeprobe.h" #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "tao/ORB.h" -#include "tao/CDR.h" -#include "tao/Server_Strategy_Factory.h" #include "tao/IIOP_Transport.h" #include "tao/IIOP_Endpoint.h" -#include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Base_Transport_Property.h" -#include "tao/Resume_Handle.h" #include "tao/Protocols_Hooks.h" #include "tao/Wait_Strategy.h" @@ -18,12 +12,10 @@ # include "tao/IIOP_Connection_Handler.i" #endif /* ! __ACE_INLINE__ */ - ACE_RCSID (tao, IIOP_Connection_Handler, "$Id$") - TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_IIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h index bf55b9c0961..9e677c26590 100644 --- a/TAO/tao/IIOP_Connection_Handler.h +++ b/TAO/tao/IIOP_Connection_Handler.h @@ -13,21 +13,19 @@ #ifndef TAO_IIOP_CONNECTION_HANDLER_H #define TAO_IIOP_CONNECTION_HANDLER_H + #include /**/ "ace/pre.h" -#include "ace/Reactor.h" +#include "ace/Svc_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/corbafwd.h" -#include "tao/Connection_Handler.h" -#include "tao/IIOPC.h" - -#include "ace/Svc_Handler.h" #include "ace/SOCK_Stream.h" +#include "tao/Connection_Handler.h" +#include "tao/Basic_Types.h" // Service Handler for this transport typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> @@ -37,6 +35,10 @@ typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> template class TAO_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ +namespace IIOP +{ + class ListenPointList; +} // Forward Decls class TAO_Pluggable_Messaging; diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 978f663ff75..ac9bfe23d9a 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -2,17 +2,14 @@ #include "IIOP_Profile.h" #include "debug.h" #include "ORB_Core.h" -#include "Client_Strategy_Factory.h" #include "Environment.h" -#include "Base_Transport_Property.h" #include "Protocols_Hooks.h" -#include "Transport_Cache_Manager.h" #include "Connect_Strategy.h" #include "Thread_Lane_Resources.h" #include "Transport.h" #include "Wait_Strategy.h" -#include "ace/Strategies_T.h" +//#include "ace/Strategies_T.h" ACE_RCSID (TAO, IIOP_Connector, diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index adf09ad823b..0fcb91e3259 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -17,6 +17,7 @@ #ifndef TAO_IIOP_CONNECTOR_H #define TAO_IIOP_CONNECTOR_H + #include /**/ "ace/pre.h" #include "ace/SOCK_Connector.h" @@ -24,11 +25,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Connector.h" + #include "tao/Transport_Connector.h" #include "tao/Connector_Impl.h" #include "tao/IIOP_Connection_Handler.h" -#include "ace/Connector.h" - class TAO_IIOP_Endpoint; diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index f189bba2457..b0faeb2cc31 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -13,7 +13,6 @@ ACE_RCSID (tao, # include "tao/IIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ - TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses) : TAO_Endpoint (IOP::TAG_INTERNET_IOP) diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h index 3603a516c27..ed46cb0abe9 100644 --- a/TAO/tao/IIOP_Endpoint.h +++ b/TAO/tao/IIOP_Endpoint.h @@ -17,16 +17,14 @@ #define TAO_IIOP_ENDPOINT_H #include /**/ "ace/pre.h" - -#include "tao/Endpoint.h" +#include "ace/INET_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Endpoint.h" #include "tao/CORBA_String.h" -#include "ace/INET_Addr.h" - class TAO_IIOP_Connection_Handler; diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp new file mode 100644 index 00000000000..64a99063b8d --- /dev/null +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -0,0 +1,269 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 + + +#include "IIOP_EndpointsC.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "IIOP_EndpointsC.inl" +#endif /* !defined INLINE */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 + + + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CS_) +#define _TAO_IIOPENDPOINTSEQUENCE_CS_ + +TAO::IIOPEndpointSequence::IIOPEndpointSequence (void) +{} + +TAO::IIOPEndpointSequence::IIOPEndpointSequence ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + TAO::IIOP_Endpoint_Info + > + (max) +{} + +TAO::IIOPEndpointSequence::IIOPEndpointSequence ( + CORBA::ULong max, + CORBA::ULong length, + TAO::IIOP_Endpoint_Info * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + TAO::IIOP_Endpoint_Info + > + (max, length, buffer, release) +{} + +TAO::IIOPEndpointSequence::IIOPEndpointSequence ( + const IIOPEndpointSequence &seq + ) + : TAO_Unbounded_Sequence< + TAO::IIOP_Endpoint_Info + > + (seq) +{} + +TAO::IIOPEndpointSequence::~IIOPEndpointSequence (void) +{} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 + +#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ +#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const TAO::IIOPEndpointSequence &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = (strm << _tao_sequence[i]); + } + + return _tao_marshal_flag; + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + TAO::IIOPEndpointSequence &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = (strm >> _tao_sequence[i]); + } + + return _tao_marshal_flag; + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1702 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_Var_Var_T< + TAO::IIOP_Endpoint_Info + >; + + template class + TAO_Var_Base_T< + TAO::IIOP_Endpoint_Info + >; + + template class + TAO_Out_T< + TAO::IIOP_Endpoint_Info, + TAO::IIOP_Endpoint_Info_var + >; + + template class + TAO_VarSeq_Var_T< + TAO::IIOPEndpointSequence, + TAO::IIOP_Endpoint_Info + >; + + template class + TAO_Seq_Var_Base_T< + TAO::IIOPEndpointSequence, + TAO::IIOP_Endpoint_Info + >; + + template class + TAO_Seq_Out_T< + TAO::IIOPEndpointSequence, + TAO::IIOPEndpointSequence_var, + TAO::IIOP_Endpoint_Info + >; + +#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CS_) +#define _TAO_IIOPENDPOINTSEQUENCE_CS_ + + template class + TAO_Unbounded_Sequence< + TAO::IIOP_Endpoint_Info + >; + +#endif /* end #if !defined */ + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Var_Var_T< \ + TAO::IIOP_Endpoint_Info \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + TAO::IIOP_Endpoint_Info \ + > + +# pragma instantiate \ + TAO_Out_T< \ + TAO::IIOP_Endpoint_Info, \ + TAO::IIOP_Endpoint_Info_var \ + > + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + TAO::IIOPEndpointSequence, \ + TAO::IIOP_Endpoint_Info \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + TAO::IIOPEndpointSequence, \ + TAO::IIOP_Endpoint_Info \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + TAO::IIOPEndpointSequence, \ + TAO::IIOPEndpointSequence_var, \ + TAO::IIOP_Endpoint_Info \ + > + +#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CS_) +#define _TAO_IIOPENDPOINTSEQUENCE_CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + TAO::IIOP_Endpoint_Info \ + > + +#endif /* end #if !defined */ + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h new file mode 100644 index 00000000000..7d62e15350f --- /dev/null +++ b/TAO/tao/IIOP_EndpointsC.h @@ -0,0 +1,216 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 + +#ifndef _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_ +#define _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_ + +#include /**/ "ace/pre.h" + +#include "tao/CDR.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Sequence_T.h" +#include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" +#include "tao/VarOut_T.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export + +#if defined (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 + +namespace TAO +{ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 + + struct IIOP_Endpoint_Info; + + typedef + TAO_Var_Var_T< + IIOP_Endpoint_Info + > + IIOP_Endpoint_Info_var; + + typedef + TAO_Out_T< + IIOP_Endpoint_Info, + IIOP_Endpoint_Info_var + > + IIOP_Endpoint_Info_out; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 + + struct TAO_Export IIOP_Endpoint_Info + { + typedef IIOP_Endpoint_Info_var _var_type; + + + TAO_String_Manager host; + CORBA::Short port; + CORBA::Short priority; + }; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CH_) +#define _TAO_IIOPENDPOINTSEQUENCE_CH_ + + class IIOPEndpointSequence; + + typedef + TAO_VarSeq_Var_T< + IIOPEndpointSequence, + IIOP_Endpoint_Info + > + IIOPEndpointSequence_var; + + typedef + TAO_Seq_Out_T< + IIOPEndpointSequence, + IIOPEndpointSequence_var, + IIOP_Endpoint_Info + > + IIOPEndpointSequence_out; + + class TAO_Export IIOPEndpointSequence + : public + TAO_Unbounded_Sequence< + IIOP_Endpoint_Info + > + { + public: + IIOPEndpointSequence (void); + IIOPEndpointSequence (CORBA::ULong max); + IIOPEndpointSequence ( + CORBA::ULong max, + CORBA::ULong length, + IIOP_Endpoint_Info* buffer, + CORBA::Boolean release = 0 + ); + IIOPEndpointSequence (const IIOPEndpointSequence &); + ~IIOPEndpointSequence (void); + + typedef IIOPEndpointSequence_var _var_type; + }; + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 + +} // module TAO + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 + +#ifndef __ACE_INLINE__ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 + +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::IIOP_Endpoint_Info &); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::IIOP_Endpoint_Info &); + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 + +#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ +#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const TAO::IIOPEndpointSequence & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + TAO::IIOPEndpointSequence & + ); + +#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 + +#endif /* __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:920 + +#if defined (__ACE_INLINE__) +#include "IIOP_EndpointsC.inl" +#endif /* defined INLINE */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#include /**/ "ace/post.h" +#endif /* ifndef */ + diff --git a/TAO/tao/IIOP_EndpointsC.inl b/TAO/tao/IIOP_EndpointsC.inl new file mode 100644 index 00000000000..c06f2918a7e --- /dev/null +++ b/TAO/tao/IIOP_EndpointsC.inl @@ -0,0 +1,73 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 + +ACE_INLINE +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const TAO::IIOP_Endpoint_Info &_tao_aggregate + ) +{ + return + (strm << _tao_aggregate.host.in ()) && + (strm << _tao_aggregate.port) && + (strm << _tao_aggregate.priority); +} + +ACE_INLINE +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + TAO::IIOP_Endpoint_Info &_tao_aggregate + ) +{ + return + (strm >> _tao_aggregate.host.out ()) && + (strm >> _tao_aggregate.port) && + (strm >> _tao_aggregate.priority); +} + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 + +#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_ +#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_ + +CORBA::Boolean TAO_Export operator<< ( + TAO_OutputCDR &, + const TAO::IIOPEndpointSequence & + ); + +CORBA::Boolean TAO_Export operator>> ( + TAO_InputCDR &, + TAO::IIOPEndpointSequence & + ); + +#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_ */ + diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 6ea92e50ea6..1f5a27cf51b 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -6,7 +6,7 @@ #include "Environment.h" #include "ORB_Core.h" #include "debug.h" -#include "iiop_endpoints.h" +#include "IIOP_EndpointsC.h" ACE_RCSID(TAO, IIOP_Profile, @@ -394,7 +394,7 @@ TAO_IIOP_Profile::encode_endpoints (void) // info is transmitted using standard ProfileBody components, its // priority is not! - TAO_IIOPEndpointSequence endpoints; + TAO::IIOPEndpointSequence endpoints; endpoints.length (this->count_); const TAO_IIOP_Endpoint *endpoint = &this->endpoint_; @@ -443,7 +443,7 @@ TAO_IIOP_Profile::decode_endpoints (void) in_cdr.reset_byte_order (ACE_static_cast(int, byte_order)); // Extract endpoints sequence. - TAO_IIOPEndpointSequence endpoints; + TAO::IIOPEndpointSequence endpoints; if ((in_cdr >> endpoints) == 0) return -1; diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor index 469967192b1..217ebfe0a74 100644 --- a/TAO/tao/Makefile.bor +++ b/TAO/tao/Makefile.bor @@ -109,6 +109,7 @@ OBJFILES = \ $(OBJDIR)\IIOP_Connection_Handler.obj \ $(OBJDIR)\IIOP_Connector.obj \ $(OBJDIR)\IIOP_Endpoint.obj \ + $(OBJDIR)\IIOP_EndpointsC.obj \ $(OBJDIR)\IIOP_Factory.obj \ $(OBJDIR)\IIOP_Lite_Factory.obj \ $(OBJDIR)\IIOP_Profile.obj \ @@ -236,7 +237,6 @@ OBJFILES = \ $(OBJDIR)\default_client.obj \ $(OBJDIR)\default_resource.obj \ $(OBJDIR)\default_server.obj \ - $(OBJDIR)\iiop_endpoints.obj \ $(OBJDIR)\operation_details.obj \ $(OBJDIR)\operation_details.obj \ $(OBJDIR)\params.obj \ diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao index 121766541c3..4484ac0fff0 100644 --- a/TAO/tao/Makefile.tao +++ b/TAO/tao/Makefile.tao @@ -24,6 +24,7 @@ PUB_HDRS = \ IIOP_Acceptor \ IIOP_Connection_Handler \ IIOP_Endpoint \ + IIOP_EndpointsC \ operation_details \ Params \ Marshal \ @@ -100,7 +101,6 @@ PLUGGABLE_PROTOCOLS_FILES = \ Acceptor_Registry \ Protocol_Factory \ Acceptor_Filter \ - iiop_endpoints \ IIOP_Factory \ IIOP_Lite_Factory \ IIOP_Profile \ @@ -109,6 +109,7 @@ PLUGGABLE_PROTOCOLS_FILES = \ IIOP_Acceptor \ IIOP_Connection_Handler \ IIOP_Endpoint \ + IIOP_EndpointsC | IIOPC PLUGGABLE_MESSAGING_FILES = \ diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index a2966f430ae..aabb22d0c5a 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -36,9 +36,15 @@ class TAO_InputCDR; namespace CORBA { class NamedValue; + typedef NamedValue *NamedValue_ptr; typedef TAO_Pseudo_Var_T<NamedValue> NamedValue_var; typedef TAO_Pseudo_Out_T<NamedValue, NamedValue_var> NamedValue_out; + TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr); + TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr); + + typedef ULong Flags; + /** * @class NamedValue * @@ -54,27 +60,27 @@ namespace CORBA */ class TAO_Export NamedValue { - friend class CORBA::ORB; - friend class CORBA::NVList; - friend class CORBA::Request; + friend class ORB; + friend class NVList; + friend class Request; public: /// optional name const char * name (void) const; /// return the value - CORBA::Any_ptr value (void) const; + Any_ptr value (void) const; /// return the parameter mode flag - CORBA::Flags flags (void) const; + Flags flags (void) const; // The pseudo object static methods.. static NamedValue * _duplicate (NamedValue *); static NamedValue * _nil (void); // = Reference counting. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + ULong _incr_refcnt (void); + ULong _decr_refcnt (void); // Useful for template programming. typedef NamedValue_ptr _ptr_type; @@ -98,16 +104,16 @@ namespace CORBA private: /// maintains how many references exist to this object - CORBA::ULong refcount_; + ULong refcount_; /// Protects the reference count. TAO_SYNCH_MUTEX refcount_lock_; /// holds the value - CORBA::Any any_; + Any any_; /// parameter mode flags - CORBA::Flags flags_; + Flags flags_; /// optional IDL name of the parameter char * name_; @@ -116,9 +122,13 @@ namespace CORBA // **************************************************************** class NVList; + typedef NVList *NVList_ptr; typedef TAO_Pseudo_Var_T<NVList> NVList_var; typedef TAO_Pseudo_Out_T<NVList, NVList_var> NVList_out; + TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr); + TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr); + /** * @class NVList * @@ -137,49 +147,49 @@ namespace CORBA */ class TAO_Export NVList { - friend class CORBA::ORB; - friend class CORBA::Request; + friend class ORB; + friend class Request; public: /// return the current number of elements in the list - CORBA::ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; + ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const; /// add an element and just initialize the flags - CORBA::NamedValue_ptr add (CORBA::Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + NamedValue_ptr add (Flags + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// add an element and initialize its name and flags - CORBA::NamedValue_ptr add_item (const char *, - CORBA::Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + NamedValue_ptr add_item (const char *, + Flags + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// initializes a value, name, and flags - CORBA::NamedValue_ptr add_value (const char *, - const CORBA::Any &, - CORBA::Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + NamedValue_ptr add_value (const char *, + const Any &, + Flags + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// just like add_item. In addition, memory management of char * /// name is taken over by the NVList - CORBA::NamedValue_ptr add_item_consume (char *, - CORBA::Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + NamedValue_ptr add_item_consume (char *, + Flags + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// just like add_value. In addition, the NVList controls the /// memory management of the char *name and Any *value parameter - CORBA::NamedValue_ptr add_value_consume (char *, - CORBA::Any_ptr, - CORBA::Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + NamedValue_ptr add_value_consume (char *, + Any_ptr, + Flags + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// retrieve the item at the nth location. Raises Bounds - CORBA::NamedValue_ptr item (CORBA::ULong n - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + NamedValue_ptr item (ULong n + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // CORBA::Status /// remove element at index n. Raises Bounds - void remove (CORBA::ULong n + void remove (ULong n ACE_ENV_ARG_DECL_WITH_DEFAULTS); // The pseudo object static methods.. @@ -187,8 +197,8 @@ namespace CORBA static NVList * _nil (void); // = Reference counting. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + ULong _incr_refcnt (void); + ULong _decr_refcnt (void); // = TAO Extensions: @@ -226,7 +236,7 @@ namespace CORBA * our CDR stream contains any marshaled arguments (needed for * GIOP 1.2). */ - CORBA::Boolean _lazy_has_arguments (void) const; + Boolean _lazy_has_arguments (void) const; // Useful for template programming. typedef NVList_ptr _ptr_type; @@ -248,8 +258,8 @@ namespace CORBA /// helper to increase the list size. This is used by all the add_ /// methods of the NVList class - CORBA::NamedValue_ptr add_element (CORBA::Flags - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + NamedValue_ptr add_element (Flags + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Lazy evaluation routine to fill up the Anys in the NVList from /// the CDR stream. @@ -257,13 +267,13 @@ namespace CORBA private: /// internal list of parameters stored as NamedValues - ACE_Unbounded_Queue<CORBA::NamedValue_ptr> values_; + ACE_Unbounded_Queue<NamedValue_ptr> values_; /// maximum length of list - CORBA::ULong max_; + ULong max_; /// maintains how many references exist to this object - CORBA::ULong refcount_; + ULong refcount_; /// Protects the reference count. TAO_SYNCH_MUTEX refcount_lock_; diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 0adf46b88fc..f189b8cd9d4 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -48,6 +48,11 @@ namespace CORBA class InterfaceDef; typedef InterfaceDef *InterfaceDef_ptr; + class Object; + typedef Object *Object_ptr; + typedef TAO_Pseudo_Var_T<Object> Object_var; + typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out; + /** * @class Object * diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h index df99235bf99..b6b5eca2d76 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h @@ -25,6 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Endpoint_Selector_Factory.h" +#include "tao/orbconf.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index f53249f4450..0e4ef7f403c 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -11,7 +11,7 @@ #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" -#include "tao/iiop_endpoints.h" +#include "tao/IIOP_EndpointsC.h" ACE_RCSID (DIOP, DIOP_Profile, @@ -386,7 +386,7 @@ TAO_DIOP_Profile::encode_endpoints (void) // info is transmitted using standard ProfileBody components, its // priority is not! - TAO_IIOPEndpointSequence endpoints; + TAO::IIOPEndpointSequence endpoints; endpoints.length (this->count_); const TAO_DIOP_Endpoint *endpoint = &this->endpoint_; @@ -454,7 +454,7 @@ TAO_DIOP_Profile::decode_endpoints (void) in_cdr.reset_byte_order (ACE_static_cast(int, byte_order)); // Extract endpoints sequence. - TAO_IIOPEndpointSequence endpoints; + TAO::IIOPEndpointSequence endpoints; if ((in_cdr >> endpoints) == 0) return -1; diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index e315abe4dd8..558cae4574a 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -9,7 +9,7 @@ #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" -#include "tao/iiop_endpoints.h" +#include "tao/IIOP_EndpointsC.h" ACE_RCSID (Strategies, SHMIOP_Profile, @@ -419,7 +419,7 @@ TAO_SHMIOP_Profile::encode_endpoints (void) // together with other endpoints because even though its addressing // info is transmitted using standard ProfileBody components, its // priority is not! - TAO_IIOPEndpointSequence endpoints; + TAO::IIOPEndpointSequence endpoints; endpoints.length (this->count_); TAO_SHMIOP_Endpoint *endpoint = &this->endpoint_; @@ -487,7 +487,7 @@ TAO_SHMIOP_Profile::decode_endpoints (void) in_cdr.reset_byte_order (ACE_static_cast(int, byte_order)); // Extract endpoints sequence. - TAO_IIOPEndpointSequence endpoints; + TAO::IIOPEndpointSequence endpoints; if ((in_cdr >> endpoints) == 0) return -1; diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index d5bae8e3741..86db10c1a33 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -512,7 +512,7 @@ SOURCE=.\IIOP_Endpoint.cpp # End Source File
# Begin Source File
-SOURCE=.\iiop_endpoints.cpp
+SOURCE=.\IIOP_EndpointsC.cpp
# End Source File
# Begin Source File
@@ -1131,10 +1131,6 @@ SOURCE=.\Any_Impl_T.h # End Source File
# Begin Source File
-SOURCE=.\Any_Special_Basic_Impl_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Any_Special_Impl_T.h
# End Source File
# Begin Source File
@@ -1515,7 +1511,7 @@ SOURCE=.\IIOP_Endpoint.h # End Source File
# Begin Source File
-SOURCE=.\iiop_endpoints.h
+SOURCE=.\IIOP_EndpointsC.h
# End Source File
# Begin Source File
@@ -2439,7 +2435,7 @@ SOURCE=.\IIOP_Endpoint.i # End Source File
# Begin Source File
-SOURCE=.\iiop_endpoints.i
+SOURCE=.\IIOP_EndpointsC.inl
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index 859f10c2ed6..e5e7b27fd9f 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -431,7 +431,7 @@ SOURCE=.\IIOP_Endpoint.cpp # End Source File
# Begin Source File
-SOURCE=.\iiop_endpoints.cpp
+SOURCE=.\IIOP_EndpointsC.cpp
# End Source File
# Begin Source File
@@ -1403,7 +1403,7 @@ SOURCE=.\IIOP_Endpoint.h # End Source File
# Begin Source File
-SOURCE=.\iiop_endpoints.h
+SOURCE=.\IIOP_EndpointsC.h
# End Source File
# Begin Source File
@@ -2319,7 +2319,7 @@ SOURCE=.\IIOP_Endpoint.i # End Source File
# Begin Source File
-SOURCE=.\iiop_endpoints.i
+SOURCE=.\IIOP_EndpointsC.inl
# End Source File
# Begin Source File
diff --git a/TAO/tao/iiop_endpoints.cpp b/TAO/tao/iiop_endpoints.cpp deleted file mode 100644 index 763d2df19df..00000000000 --- a/TAO/tao/iiop_endpoints.cpp +++ /dev/null @@ -1,210 +0,0 @@ -/* -*- C++ -*- $Id$ */ -// $Id$ -// -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#include "iiop_endpoints.h" - -#if !defined (__ACE_INLINE__) -#include "iiop_endpoints.i" -#endif /* !defined INLINE */ - -static const CORBA::Long _oc_TAO_IIOP_Endpoint_Info[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x5f456e64), ACE_NTOHL (0x706f696e), ACE_NTOHL (0x745f496e), ACE_NTOHL (0x666f3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:TAO_IIOP_Endpoint_Info:1.0 - 23, ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x5f456e64), ACE_NTOHL (0x706f696e), ACE_NTOHL (0x745f496e), ACE_NTOHL (0x666f0000), // name = TAO_IIOP_Endpoint_Info - 3, // member count - 5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0), // name = host - CORBA::tk_string, - 0U, // string length - 5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0), // name = port - CORBA::tk_short, - - 9, ACE_NTOHL (0x7072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = priority - CORBA::tk_short, - -}; -static CORBA::TypeCode _tc_TAO_tc_TAO_IIOP_Endpoint_Info (CORBA::tk_struct, sizeof (_oc_TAO_IIOP_Endpoint_Info), (char *) &_oc_TAO_IIOP_Endpoint_Info, 0, sizeof (TAO_IIOP_Endpoint_Info)); -CORBA::TypeCode_ptr _tc_TAO_IIOP_Endpoint_Info = &_tc_TAO_tc_TAO_IIOP_Endpoint_Info; - -void TAO_IIOP_Endpoint_Info::_tao_any_destructor (void *x) -{ - TAO_IIOP_Endpoint_Info *tmp = ACE_static_cast (TAO_IIOP_Endpoint_Info*,x); - delete tmp; -} - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_TAO_IIOPENDPOINTSEQUENCE_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_TAO_IIOPENDPOINTSEQUENCE_CS_ - - void - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::_allocate_buffer (CORBA::ULong length) - { - TAO_IIOP_Endpoint_Info* tmp = 0; - tmp = _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::allocbuf (length); - - if (this->buffer_ != 0) - { - TAO_IIOP_Endpoint_Info *old = ACE_reinterpret_cast (TAO_IIOP_Endpoint_Info *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::freebuf (old); - - } - this->buffer_ = tmp; - } - - void - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - TAO_IIOP_Endpoint_Info *tmp = ACE_reinterpret_cast (TAO_IIOP_Endpoint_Info *,this->buffer_); - - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::freebuf (tmp); - this->buffer_ = 0; - } - - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::~_TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (void) // Dtor. - { - this->_deallocate_buffer (); - } - - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CS_) -#define _TAO_IIOPENDPOINTSEQUENCE_CS_ - -// ************************************************************* -// TAO_IIOPEndpointSequence -// ************************************************************* - -TAO_IIOPEndpointSequence::TAO_IIOPEndpointSequence (void) -{} -TAO_IIOPEndpointSequence::TAO_IIOPEndpointSequence (CORBA::ULong max) // uses max size - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TAO_IIOP_Endpoint_Info> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} -TAO_IIOPEndpointSequence::TAO_IIOPEndpointSequence (CORBA::ULong max, CORBA::ULong length, TAO_IIOP_Endpoint_Info *buffer, CORBA::Boolean release) - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TAO_IIOP_Endpoint_Info> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} -TAO_IIOPEndpointSequence::TAO_IIOPEndpointSequence (const TAO_IIOPEndpointSequence &seq) // copy ctor - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TAO_IIOP_Endpoint_Info> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} -TAO_IIOPEndpointSequence::~TAO_IIOPEndpointSequence (void) // dtor -{} -void TAO_IIOPEndpointSequence::_tao_any_destructor (void *x) -{ - TAO_IIOPEndpointSequence *tmp = ACE_static_cast (TAO_IIOPEndpointSequence*,x); - delete tmp; -} - - -#endif /* end #if !defined */ - -static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x456e6470), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x53657175), ACE_NTOHL (0x656e6365), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:TAO_IIOPEndpointSequence:1.0 - 25, ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x456e6470), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x53657175), ACE_NTOHL (0x656e6365), ACE_NTOHL (0x0), // name = TAO_IIOPEndpointSequence - CORBA::tk_sequence, // typecode kind - 144, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_struct, // typecode kind - 128, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x5f456e64), ACE_NTOHL (0x706f696e), ACE_NTOHL (0x745f496e), ACE_NTOHL (0x666f3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:TAO_IIOP_Endpoint_Info:1.0 - 23, ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x5f456e64), ACE_NTOHL (0x706f696e), ACE_NTOHL (0x745f496e), ACE_NTOHL (0x666f0000), // name = TAO_IIOP_Endpoint_Info - 3, // member count - 5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0), // name = host - CORBA::tk_string, - 0U, // string length - 5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0), // name = port - CORBA::tk_short, - - 9, ACE_NTOHL (0x7072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = priority - CORBA::tk_short, - - - 0U, - -}; -static CORBA::TypeCode _tc_TAO_tc_TAO_IIOPEndpointSequence (CORBA::tk_alias, sizeof (_oc_TAO_IIOPEndpointSequence), (char *) &_oc_TAO_IIOPEndpointSequence, 0, sizeof (TAO_IIOPEndpointSequence)); -CORBA::TypeCode_ptr _tc_TAO_IIOPEndpointSequence = &_tc_TAO_tc_TAO_IIOPEndpointSequence; - - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const TAO_IIOPEndpointSequence &_tao_sequence - ) -{ - if (strm << _tao_sequence.length ()) - { - // encode all elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - return _tao_marshal_flag; - } - return 0; // error -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - TAO_IIOPEndpointSequence &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len; - if (strm >> _tao_seq_len) - { - // set the length of the sequence - _tao_sequence.length (_tao_seq_len); - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - return _tao_marshal_flag; - } - return 0; // error -} - diff --git a/TAO/tao/iiop_endpoints.h b/TAO/tao/iiop_endpoints.h deleted file mode 100644 index 78bdb26327b..00000000000 --- a/TAO/tao/iiop_endpoints.h +++ /dev/null @@ -1,221 +0,0 @@ -/* -*- C++ -*- $Id$ */ -// $Id$ -// -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef _TAO_IDL_IIOP_ENDPOINTSC_H_ -#define _TAO_IDL_IIOP_ENDPOINTSC_H_ - -#include /**/ "ace/pre.h" -#include "tao/corbafwd.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Managed_Types.h" -#include "tao/Sequence.h" -#include "tao/CDR.h" -#include "tao/Typecode.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO TAO_Export - -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -struct TAO_IIOP_Endpoint_Info; -class TAO_IIOP_Endpoint_Info_var; - -struct TAO_Export TAO_IIOP_Endpoint_Info -{ - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef TAO_IIOP_Endpoint_Info_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static void _tao_any_destructor (void*); - - TAO_String_Manager host; - CORBA::Short port; - CORBA::Short priority; -}; - -extern TAO_Export CORBA::TypeCode_ptr _tc_TAO_IIOP_Endpoint_Info; - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_TAO_IIOPENDPOINTSEQUENCE_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_TAO_IIOPENDPOINTSEQUENCE_CH_ - - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (void); // Default constructor. - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (CORBA::ULong maximum, - CORBA::ULong length, - TAO_IIOP_Endpoint_Info *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (const _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence &rhs); - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence &operator= (const _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence &rhs); - virtual ~_TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (void); // Dtor. - // = Accessors. - TAO_IIOP_Endpoint_Info &operator[] (CORBA::ULong i); - const TAO_IIOP_Endpoint_Info &operator[] (CORBA::ULong i) const; - // = Static operations. - static TAO_IIOP_Endpoint_Info *allocbuf (CORBA::ULong size); - static void freebuf (TAO_IIOP_Endpoint_Info *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - TAO_IIOP_Endpoint_Info *get_buffer (CORBA::Boolean orphan = 0); - const TAO_IIOP_Endpoint_Info *get_buffer (void) const; - void replace (CORBA::ULong max, - CORBA::ULong length, - TAO_IIOP_Endpoint_Info *data, - CORBA::Boolean release); - }; - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CH_) -#define _TAO_IIOPENDPOINTSEQUENCE_CH_ - -class TAO_IIOPEndpointSequence; -class TAO_IIOPEndpointSequence_var; - -// ************************************************************* -// TAO_IIOPEndpointSequence -// ************************************************************* - -class TAO_Export TAO_IIOPEndpointSequence : public -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TAO_IIOP_Endpoint_Info> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -{ -public: - TAO_IIOPEndpointSequence (void); // default ctor - TAO_IIOPEndpointSequence (CORBA::ULong max); // uses max size - TAO_IIOPEndpointSequence ( - CORBA::ULong max, - CORBA::ULong length, - TAO_IIOP_Endpoint_Info *buffer, - CORBA::Boolean release=0 - ); - TAO_IIOPEndpointSequence (const TAO_IIOPEndpointSequence &); // copy ctor - ~TAO_IIOPEndpointSequence (void); - static void _tao_any_destructor (void*); - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef TAO_IIOPEndpointSequence_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - -}; - -#endif /* end #if !defined */ - - -#if !defined (_TAO_IIOPENDPOINTSEQUENCE___VAR_CH_) -#define _TAO_IIOPENDPOINTSEQUENCE___VAR_CH_ - -// ************************************************************* -// class TAO_IIOPEndpointSequence_var -// ************************************************************* - -class TAO_Export TAO_IIOPEndpointSequence_var -{ -public: - TAO_IIOPEndpointSequence_var (void); // default constructor - TAO_IIOPEndpointSequence_var (TAO_IIOPEndpointSequence *); - TAO_IIOPEndpointSequence_var (const TAO_IIOPEndpointSequence_var &); // copy constructor - ~TAO_IIOPEndpointSequence_var (void); // destructor - - TAO_IIOPEndpointSequence_var &operator= (TAO_IIOPEndpointSequence *); - TAO_IIOPEndpointSequence_var &operator= (const TAO_IIOPEndpointSequence_var &); - TAO_IIOPEndpointSequence *operator-> (void); - const TAO_IIOPEndpointSequence *operator-> (void) const; - - operator const TAO_IIOPEndpointSequence &() const; - operator TAO_IIOPEndpointSequence &(); - operator TAO_IIOPEndpointSequence &() const; - operator TAO_IIOPEndpointSequence *&(); // variable-size base types only - - TAO_IIOP_Endpoint_Info &operator[] (CORBA::ULong index); - // in, inout, out, _retn - const TAO_IIOPEndpointSequence &in (void) const; - TAO_IIOPEndpointSequence &inout (void); - TAO_IIOPEndpointSequence *&out (void); - TAO_IIOPEndpointSequence *_retn (void); - TAO_IIOPEndpointSequence *ptr (void) const; - -private: - TAO_IIOPEndpointSequence *ptr_; -}; - - -#endif /* end #if !defined */ - - -extern TAO_Export CORBA::TypeCode_ptr _tc_TAO_IIOPEndpointSequence; - -#ifndef __ACE_INLINE__ - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IIOP_Endpoint_Info &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IIOP_Endpoint_Info &); - -#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ -#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ - -TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const TAO_IIOPEndpointSequence & - ); -TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - TAO_IIOPEndpointSequence & - ); - -#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */ - - -#endif /* __ACE_INLINE__ */ - - -#if defined (__ACE_INLINE__) -#include "iiop_endpoints.i" -#endif /* defined INLINE */ - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ diff --git a/TAO/tao/iiop_endpoints.i b/TAO/tao/iiop_endpoints.i deleted file mode 100644 index 902ce6b2410..00000000000 --- a/TAO/tao/iiop_endpoints.i +++ /dev/null @@ -1,362 +0,0 @@ -/* -*- C++ -*- $Id$ */ -// $Id$ -// -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// ************************************************************* -// Inline operations for class TAO_IIOP_Endpoint_Info_var -// ************************************************************* - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_TAO_IIOPENDPOINTSEQUENCE_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_TAO_IIOPENDPOINTSEQUENCE_CI_ - - // = Static operations. - ACE_INLINE TAO_IIOP_Endpoint_Info * - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::allocbuf (CORBA::ULong size) - // Allocate storage for the sequence. - { - TAO_IIOP_Endpoint_Info *retval = 0; - ACE_NEW_RETURN (retval, TAO_IIOP_Endpoint_Info[size], 0); - return retval; - } - - ACE_INLINE void _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::freebuf (TAO_IIOP_Endpoint_Info *buffer) - // Free the sequence. - { - delete [] buffer; - } - - ACE_INLINE - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::_TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (void) // Default constructor. - { - } - - ACE_INLINE - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::_TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (CORBA::ULong maximum) // Constructor using a maximum length value. - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::allocbuf (maximum)) - { - } - - ACE_INLINE - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::_TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (CORBA::ULong maximum, - CORBA::ULong length, - TAO_IIOP_Endpoint_Info *data, - CORBA::Boolean release) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) - { - } - - ACE_INLINE - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::_TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence (const _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence &rhs) - // Copy constructor. - : TAO_Unbounded_Base_Sequence (rhs) - { - if (rhs.buffer_ != 0) - { - TAO_IIOP_Endpoint_Info *tmp1 = _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::allocbuf (this->maximum_); - TAO_IIOP_Endpoint_Info * const tmp2 = ACE_reinterpret_cast (TAO_IIOP_Endpoint_Info * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } - } - - ACE_INLINE _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence & - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::operator= (const _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence &rhs) - // Assignment operator. - { - if (this == &rhs) - return *this; - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // free the old buffer - TAO_IIOP_Endpoint_Info *tmp = ACE_reinterpret_cast (TAO_IIOP_Endpoint_Info *, this->buffer_); - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::allocbuf (rhs.maximum_); - } - } - else - this->buffer_ = _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::allocbuf (rhs.maximum_); - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - TAO_IIOP_Endpoint_Info *tmp1 = ACE_reinterpret_cast (TAO_IIOP_Endpoint_Info *, this->buffer_); - TAO_IIOP_Endpoint_Info * const tmp2 = ACE_reinterpret_cast (TAO_IIOP_Endpoint_Info * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp1[i] = tmp2[i]; - - return *this; - } - - // = Accessors. - ACE_INLINE TAO_IIOP_Endpoint_Info & - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::operator[] (CORBA::ULong i) - // operator [] - { - ACE_ASSERT (i < this->maximum_); - TAO_IIOP_Endpoint_Info* tmp = ACE_reinterpret_cast(TAO_IIOP_Endpoint_Info*,this->buffer_); - return tmp[i]; - } - - ACE_INLINE const TAO_IIOP_Endpoint_Info & - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::operator[] (CORBA::ULong i) const - // operator [] - { - ACE_ASSERT (i < this->maximum_); - TAO_IIOP_Endpoint_Info * const tmp = ACE_reinterpret_cast (TAO_IIOP_Endpoint_Info* ACE_CAST_CONST, this->buffer_); - return tmp[i]; - } - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - ACE_INLINE TAO_IIOP_Endpoint_Info * - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::get_buffer (CORBA::Boolean orphan) - { - TAO_IIOP_Endpoint_Info *result = 0; - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = ACE_reinterpret_cast (TAO_IIOP_Endpoint_Info*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish - // ownership. - result = ACE_reinterpret_cast(TAO_IIOP_Endpoint_Info*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - return result; - } - - ACE_INLINE const TAO_IIOP_Endpoint_Info * - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::get_buffer (void) const - { - return ACE_reinterpret_cast(const TAO_IIOP_Endpoint_Info * ACE_CAST_CONST, this->buffer_); - } - - ACE_INLINE void - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::replace (CORBA::ULong max, - CORBA::ULong length, - TAO_IIOP_Endpoint_Info *data, - CORBA::Boolean release) - { - this->maximum_ = max; - this->length_ = length; - if (this->buffer_ && this->release_ == 1) - { - TAO_IIOP_Endpoint_Info *tmp = ACE_reinterpret_cast(TAO_IIOP_Endpoint_Info*,this->buffer_); - _TAO_Unbounded_Sequence_TAO_IIOPEndpointSequence::freebuf (tmp); - } - this->buffer_ = data; - this->release_ = release; - } - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CI_) -#define _TAO_IIOPENDPOINTSEQUENCE_CI_ - -// ************************************************************* -// Inline operations for class TAO_IIOPEndpointSequence_var -// ************************************************************* - -ACE_INLINE -TAO_IIOPEndpointSequence_var::TAO_IIOPEndpointSequence_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -TAO_IIOPEndpointSequence_var::TAO_IIOPEndpointSequence_var (TAO_IIOPEndpointSequence *p) - : ptr_ (p) -{} - -ACE_INLINE -TAO_IIOPEndpointSequence_var::TAO_IIOPEndpointSequence_var (const ::TAO_IIOPEndpointSequence_var &p) // copy constructor -{ - if (p.ptr_) - ACE_NEW (this->ptr_, ::TAO_IIOPEndpointSequence (*p.ptr_)); - else - this->ptr_ = 0; -} - -ACE_INLINE -TAO_IIOPEndpointSequence_var::~TAO_IIOPEndpointSequence_var (void) // destructor -{ - delete this->ptr_; -} - -ACE_INLINE TAO_IIOPEndpointSequence_var & -TAO_IIOPEndpointSequence_var::operator= (TAO_IIOPEndpointSequence *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE TAO_IIOPEndpointSequence_var & -TAO_IIOPEndpointSequence_var::operator= (const ::TAO_IIOPEndpointSequence_var &p) // deep copy -{ - if (this != &p) - { - delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, ::TAO_IIOPEndpointSequence (*p.ptr_), *this); - } - return *this; -} - -ACE_INLINE const ::TAO_IIOPEndpointSequence * -TAO_IIOPEndpointSequence_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::TAO_IIOPEndpointSequence * -TAO_IIOPEndpointSequence_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TAO_IIOPEndpointSequence_var::operator const ::TAO_IIOPEndpointSequence &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TAO_IIOPEndpointSequence_var::operator ::TAO_IIOPEndpointSequence &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TAO_IIOPEndpointSequence_var::operator ::TAO_IIOPEndpointSequence &() const // cast -{ - return *this->ptr_; -} - -// variable-size types only -ACE_INLINE -TAO_IIOPEndpointSequence_var::operator ::TAO_IIOPEndpointSequence *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE TAO_IIOP_Endpoint_Info & -TAO_IIOPEndpointSequence_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE const ::TAO_IIOPEndpointSequence & -TAO_IIOPEndpointSequence_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::TAO_IIOPEndpointSequence & -TAO_IIOPEndpointSequence_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for variable size -ACE_INLINE ::TAO_IIOPEndpointSequence *& -TAO_IIOPEndpointSequence_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::TAO_IIOPEndpointSequence * -TAO_IIOPEndpointSequence_var::_retn (void) -{ - ::TAO_IIOPEndpointSequence *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::TAO_IIOPEndpointSequence * -TAO_IIOPEndpointSequence_var::ptr (void) const -{ - return this->ptr_; -} - -#endif /* end #if !defined */ - -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IIOP_Endpoint_Info &_tao_aggregate) -{ - if ( - (strm << _tao_aggregate.host.in ()) && - (strm << _tao_aggregate.port) && - (strm << _tao_aggregate.priority) - ) - return 1; - else - return 0; - -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IIOP_Endpoint_Info &_tao_aggregate) -{ - if ( - (strm >> _tao_aggregate.host.out ()) && - (strm >> _tao_aggregate.port) && - (strm >> _tao_aggregate.priority) - ) - return 1; - else - return 0; - -} - - -#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_ -#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const TAO_IIOPEndpointSequence & - ); -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - TAO_IIOPEndpointSequence & - ); - -#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_ */ - diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 34184f67e84..449588d6eea 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -24,7 +24,6 @@ project(TAO) : acelib, taoversion, core, tao_output { Acceptor_Registry.cpp Protocol_Factory.cpp Acceptor_Filter.cpp - iiop_endpoints.cpp IIOP_Factory.cpp IIOP_Lite_Factory.cpp IIOP_Profile.cpp @@ -33,6 +32,7 @@ project(TAO) : acelib, taoversion, core, tao_output { IIOP_Acceptor.cpp IIOP_Connection_Handler.cpp IIOP_Endpoint.cpp + IIOP_EndpointsC.cpp IIOPC.cpp } |