diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-09-25 18:18:29 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-09-25 18:18:29 +0000 |
| commit | 8c2acd7d18edeca943556ac06b58ef0ac8a15670 (patch) | |
| tree | 3e2d146a8f58c5ea761633a35a261e2f22515ec6 /TAO | |
| parent | e1970430fe1c159d1555650c32204392823b5271 (diff) | |
| download | ATCD-8c2acd7d18edeca943556ac06b58ef0ac8a15670.tar.gz | |
ChangeLogTag:Mon Sep 25 11:09:20 2000 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO')
35 files changed, 4284 insertions, 1127 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 0fc12236829..35c2117299f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,109 @@ +Mon Sep 25 11:09:20 2000 Ossama Othman <ossama@uci.edu> + + * TAO_IDL/be/be_helper.cpp (copyright): + + Cosmetic update for the RCS ID in generated files. Updated the + copyright information to include the UCI wing of the DOC group. + + * tao/params.h: + * tao/params.cpp: + * tao/params.i: + + Removed unused "init_ref_" attribute. The new IOR table + obviates the need for this attribute. + + Changed "mcast_discovery_endpoint_" attribute from an + ACE_CString to a CORBA::String_var. This get around an access + violation that was occuring when allocating space for a string + inside the ACE_CString assignment operator. A fix for thThe + reason for the access violation itself will be committed soon. + [Bug 665] + + * tao/corbafwd.cpp (string_dup, wstring_dup): + + Set e rrno to EINVAL if a null pointer was passed as an + argument. + + * tao/corbafwd.h: + * tao/CORBA_String.cpp: + + Removed CORBA::string_copy() TAO extension. The standard + CORBA::string_dup() should be used instead. + + * tao/corbafwd.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h: + + Moved macro definition of TAO_TAG_SSL_ENDPOINTS to + SSLIOP_Endpoint.h. Security-specific code should not be placed + anywhere within the ORB core. + + * tao/IOP.pidl: + + Removed all security related tags. They are superseded by those + in the SSLIOP and SECIOP modules in the Security Service IDL. + + * tao/IOPC.cpp: + * tao/IOPC.h: + * tao/IOPC.i: + * tao/IOPS.cpp: + * tao/IOPS.h: + * tao/IOPS.i: + * tao/IOPS_T.cpp: + * tao/IOPS_T.h: + * tao/IOPS_T.i: + + Regenerated these files from newly modified `IOP.pidl'. + + * tao/diffs/IOP.diff: + + Added a patch file for the hand modified IOP stubs and + skeletons. + + * tao/Tagged_Components.i (unique_tag): + + Removed references to all security related tags. Those tags are + now in defined in the Security Service IDL sources, and + supersede the ones formerly in `IOP.pidl.' Again, no security + related code should exist in the ORB core. + + * tao/IIOP_Acceptor.h: + * tao/IIOP_Acceptor.cpp (hostname, create_mprofile, + create_rt_mprofile, open_i): + * orbsvcs/orbsvcs/SSLIOP_Acceptor.cpp (create_mprofile, + create_rt_mprofile, open_i): + + Use "char *" in place of "ACE_CString" since the latter is + lighter weight, and since the additional functionality provided + by the ACE_CString class is not needed. + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp + (create_mprofile, create_rt_mprofile): + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp (decode): + + Use SSL tag value from the SSLIOP module instead of the one in + the IOP module since security service 1.7 specification + explicitly states that the tag in the SSLIOP module should be + used to identify an SSLIOP tagged component. + + * orbsvcs/orbsvcs/Security.idl: + * orbsvcs/orbsvcs/SecurityLevel1.idl: + * orbsvcs/orbsvcs/SecurityLevel2.idl: + * orbsvcs/orbsvcs/SecurityAdmin.idl: + * orbsvcs/orbsvcs/SecurityReplaceable.idl: + * orbsvcs/orbsvcs/SSLIOP.idl: + * orbsvcs/orbsvcs/SECIOP.idl: + + Added '#pragma prefix ""' to the end of these IDL sources to + to prevent the prefix pragma specific to each of these IDL + sources from being unintentionally used in other IDL sources + that include them. + + * orbsvcs/examples/Security/Send_File/Send_File_Client.dsp: + * orbsvcs/examples/Security/Send_File/Send_File_Server.dsp: + + Changed binary names to match those used in the `run_test.pl' + script so that the script may be used to run them. + Mon Sep 25 12:44:11 2000 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Makefile.bor: diff --git a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Client.dsp b/TAO/orbsvcs/examples/Security/Send_File/Send_File_Client.dsp index a55abd2ce96..8110ff1d51a 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Client.dsp +++ b/TAO/orbsvcs/examples/Security/Send_File/Send_File_Client.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 TAO_PortableServer.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Send_File_Client.exe" /libpath:"../../../../../ace" /libpath:"../../../../tao"
+# ADD LINK32 TAO_PortableServer.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../../../ace" /libpath:"../../../../tao"
!ELSEIF "$(CFG)" == "Send_File_Client - Win32 Debug"
@@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Send_File_Client.exe" /pdbtype:sept /libpath:"../../../../../ace" /libpath:"../../../../tao"
+# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../../../ace" /libpath:"../../../../tao"
!ENDIF
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp b/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp index 7c520545f88..9fac4936254 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp +++ b/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Send_File_Server.exe" /libpath:"../../../../../ace" /libpath:"../../../../tao" /libpath:"../../../../tao/PortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../../../ace" /libpath:"../../../../tao" /libpath:"../../../../tao/PortableServer"
!ELSEIF "$(CFG)" == "Send_File_Server - Win32 Debug"
@@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Send_File_Server.exe" /pdbtype:sept /libpath:"../../../../../ace" /libpath:"../../../../tao" /libpath:"../../../../tao/PortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../../../ace" /libpath:"../../../../tao" /libpath:"../../../../tao/PortableServer"
!ENDIF
diff --git a/TAO/orbsvcs/examples/Security/Send_File/run_test.pl b/TAO/orbsvcs/examples/Security/Send_File/run_test.pl index 99e285a77e9..963e56fd136 100755 --- a/TAO/orbsvcs/examples/Security/Send_File/run_test.pl +++ b/TAO/orbsvcs/examples/Security/Send_File/run_test.pl @@ -18,7 +18,7 @@ $ENV{'SSL_CERT_FILE'} = 'cacert.pem'; $iorfile = "server.ior"; unlink $iorfile; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBsvcconf server_nopasswd.conf " + " -ORBSvcConf server_nopasswd.conf " . " -o $iorfile"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { @@ -28,7 +28,7 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { } $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBsvcconf client_nopasswd.conf " + " -ORBSvcConf client_nopasswd.conf " . " -k file://$iorfile < client.cpp"); $client = $CL->TimedWait (60); diff --git a/TAO/orbsvcs/orbsvcs/SECIOP.idl b/TAO/orbsvcs/orbsvcs/SECIOP.idl index 1a768b27a5a..4394731b9a2 100644 --- a/TAO/orbsvcs/orbsvcs/SECIOP.idl +++ b/TAO/orbsvcs/orbsvcs/SECIOP.idl @@ -200,4 +200,7 @@ module SECIOP { SecurityName security_name; }; }; + +#pragma prefix "" + #endif /* _SECIOP_IDL_ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.idl b/TAO/orbsvcs/orbsvcs/SSLIOP.idl index c721eb55a8c..ac7798a1e8b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.idl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.idl @@ -23,4 +23,7 @@ module SSLIOP { unsigned short port; }; }; + +#pragma prefix "" + #endif /* _SSLIOP_IDL */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 7048c7e0520..e03744a7ff3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -125,7 +125,7 @@ TAO_SSLIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key, { TAO_SSLIOP_Profile *pfile = 0; ACE_NEW_RETURN (pfile, - TAO_SSLIOP_Profile (this->hosts_[i].c_str (), + TAO_SSLIOP_Profile (this->hosts_[i], this->addrs_[i].get_port_number (), object_key, this->addrs_[i], @@ -154,7 +154,7 @@ TAO_SSLIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key, pfile->tagged_components ().set_code_sets (code_set_info); IOP::TaggedComponent component; - component.tag = IOP::TAG_SSL_SEC_TRANS; + component.tag = SSLIOP::TAG_SSL_SEC_TRANS; // @@???? Check this code, only intended as guideline... TAO_OutputCDR cdr; cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER); @@ -207,7 +207,7 @@ TAO_SSLIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, if (ssliop_profile == 0) { ACE_NEW_RETURN (ssliop_profile, - TAO_SSLIOP_Profile (this->hosts_[0].c_str (), + TAO_SSLIOP_Profile (this->hosts_[0], this->addrs_[0].get_port_number (), object_key, this->addrs_[0], @@ -242,7 +242,7 @@ TAO_SSLIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, ssliop_profile->tagged_components ().set_code_sets (code_set_info); IOP::TaggedComponent component; - component.tag = IOP::TAG_SSL_SEC_TRANS; + component.tag = SSLIOP::TAG_SSL_SEC_TRANS; // @@???? Check this code, only intended as guideline... TAO_OutputCDR cdr; cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER); @@ -273,7 +273,7 @@ TAO_SSLIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, TAO_SSLIOP_Endpoint *ssl_endp = 0; TAO_IIOP_Endpoint *iiop_endp = 0; ACE_NEW_RETURN (iiop_endp, - TAO_IIOP_Endpoint (this->hosts_[index].c_str (), + TAO_IIOP_Endpoint (this->hosts_[index], this->addrs_[index].get_port_number (), this->addrs_[index]), -1); @@ -418,8 +418,8 @@ TAO_SSLIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_INET_Addr ssl_address; - // We do this make sure the port number the endpoint is listening on - // gets set in the addr. + // We do this to make sure the port number the endpoint is listening + // on gets set in the addr. if (this->ssl_acceptor_.acceptor ().get_local_addr (ssl_address) != 0) { // @@ Should this be a catastrophic error??? @@ -443,7 +443,7 @@ TAO_SSLIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("SSLIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - this->hosts_[i].c_str (), + this->hosts_[i], this->ssl_component_.port)); } } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index 8cad4986df7..863c6d8d919 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -32,6 +32,9 @@ #include "SSLIOP_Export.h" #include "orbsvcs/SSLIOPC.h" +// Tag for storing multiple endpoints within a single profile. +#define TAO_TAG_SSL_ENDPOINTS 0x54414f01U + class TAO_SSLIOP_Client_Connection_Handler; class TAO_IIOP_Endpoint; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index 0a22a0d3078..a1d168bfd7b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -95,7 +95,7 @@ TAO_SSLIOP_Profile::decode (TAO_InputCDR& cdr) // we are dealing with pure IIOP profile. int ssl_component_found = 0; IOP::TaggedComponent component; - component.tag = IOP::TAG_SSL_SEC_TRANS; + component.tag = SSLIOP::TAG_SSL_SEC_TRANS; if (this->tagged_components ().get_component (component) == 0) this->ssl_endpoint_.ssl_component_.port = 0; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl index d6ceebc2f3b..895ac53d793 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl @@ -5,8 +5,8 @@ // is: // // tao_idl -// -Wb,export_macro=TAO_Export \ -// -Wb,export_include="tao/corbafwd.h" \ +// -Wb,export_macro=TAO_SSLIOP_Export \ +// -Wb,export_include="tao/SSLIOP_Export.h" \ // -Wb,pre_include="ace/pre.h" \ // -Wb,post_include="ace/post.h" \ // ssl_endpoints.pidl diff --git a/TAO/orbsvcs/orbsvcs/Security.idl b/TAO/orbsvcs/orbsvcs/Security.idl index 0a100c0fa01..4b1a83970a7 100644 --- a/TAO/orbsvcs/orbsvcs/Security.idl +++ b/TAO/orbsvcs/orbsvcs/Security.idl @@ -360,4 +360,7 @@ module Security { const CORBA::PolicyType SecDelegationDirectivePolicy = 38; const CORBA::PolicyType SecEstablishTrustPolicy = 39; }; + +#pragma prefix "" + #endif /* _SECURITY_IDL_ */ diff --git a/TAO/orbsvcs/orbsvcs/SecurityAdmin.idl b/TAO/orbsvcs/orbsvcs/SecurityAdmin.idl index 20c2f7c2d77..a4860e287e4 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityAdmin.idl @@ -139,4 +139,6 @@ module SecurityAdmin { }; }; +#pragma prefix "" + #endif /* _SECURITY_ADMIN_IDL_ */ diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl index e4ded7d6288..ab96f02809a 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl @@ -25,4 +25,7 @@ module SecurityLevel1 { }; }; + +#pragma prefix "" + #endif /* _SECURITY_LEVEL_1_IDL_ */ diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl index 270e3fd41a8..1cf18366d7c 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl @@ -251,4 +251,6 @@ module SecurityLevel2 { }; }; +#pragma prefix "" + #endif /* _SECURITY_LEVEL_2_IDL_ */ diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl index b7b09b63d81..1288a558fcb 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl @@ -232,4 +232,6 @@ module SecurityReplaceable { }; +#pragma prefix "" + #endif /* _SECURITY_REPLACEABLE_IDL_ */ diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index bf7c26da159..d0f35ed9107 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -16,12 +16,6 @@ ACE_RCSID(tao, CORBA_String, "$Id$") // String utility support; this needs to be integrated with the ORB's // own memory allocation subsystem. -char * -CORBA::string_copy (const char *str) -{ - return CORBA::string_dup (str); -} - CORBA_String_var::CORBA_String_var (char *p) : ptr_ (p) { diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 8e4bcc56a1a..385a6fa6a9f 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -69,6 +69,10 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void) delete this->accept_strategy_; delete [] this->addrs_; + + for (size_t i = 0; i < this->endpoint_count_; ++i) + CORBA::string_free (this->hosts_[i]); + delete [] this->hosts_; } @@ -105,7 +109,7 @@ TAO_IIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key, // @@ Use autopointer here. TAO_IIOP_Profile *pfile = 0; ACE_NEW_RETURN (pfile, - TAO_IIOP_Profile (this->hosts_[i].c_str (), + TAO_IIOP_Profile (this->hosts_[i], this->addrs_[i].get_port_number (), object_key, this->addrs_[i], @@ -163,7 +167,7 @@ TAO_IIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, if (iiop_profile == 0) { ACE_NEW_RETURN (iiop_profile, - TAO_IIOP_Profile (this->hosts_[0].c_str (), + TAO_IIOP_Profile (this->hosts_[0], this->addrs_[0].get_port_number (), object_key, this->addrs_[0], @@ -201,7 +205,7 @@ TAO_IIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, { TAO_IIOP_Endpoint *endpoint = 0; ACE_NEW_RETURN (endpoint, - TAO_IIOP_Endpoint (this->hosts_[index].c_str (), + TAO_IIOP_Endpoint (this->hosts_[index], this->addrs_[index].get_port_number (), this->addrs_[index]), -1); @@ -316,7 +320,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, -1); ACE_NEW_RETURN (this->hosts_, - ACE_CString[this->endpoint_count_], + char *[this->endpoint_count_], -1); if (this->hostname (orb_core, @@ -442,7 +446,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) IIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - this->hosts_[i].c_str (), + this->hosts_[i], this->addrs_[i].get_port_number ())); } } @@ -453,7 +457,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr) int TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core, ACE_INET_Addr &addr, - ACE_CString &host) + char *&host) { char tmp_host[MAXHOSTNAMELEN + 1]; @@ -472,10 +476,10 @@ TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core, return -1; } - host = tmp; + host = CORBA::string_dup (tmp); } else - host = tmp_host; + host = CORBA::string_dup (tmp_host); return 0; } @@ -540,7 +544,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) -1); ACE_NEW_RETURN (this->hosts_, - ACE_CString[this->endpoint_count_], + char *[this->endpoint_count_], -1); // The number of hosts/interfaces we want to cache may not be the diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index 290cf3478b2..fdb3c879f3a 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -86,7 +86,7 @@ private: int hostname (TAO_ORB_Core *orb_core, ACE_INET_Addr &addr, - ACE_CString &host); + char *&host); // Set the host name for the given addr. int probe_interfaces (TAO_ORB_Core *orb_core); @@ -111,7 +111,7 @@ private: protected: ACE_INET_Addr *addrs_; - ACE_CString *hosts_; + char **hosts_; // Cache the information about the endpoints serviced by this // acceptor. // There may in fact be multiple hostnames for this endpoint. For diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl index fc24428968d..c0004a94973 100644 --- a/TAO/tao/IOP.pidl +++ b/TAO/tao/IOP.pidl @@ -1,7 +1,23 @@ +// -*- IDL -*- // // $Id$ + +// +// This file was used to generate the code in +// IOP*.* The command used to generate code +// is: +// +// tao_idl \ +// -Wb,export_macro=TAO_Export \ +// -Wb,export_include="tao/TAO_Export.h" \ +// -Wb,pre_include="ace/pre.h" \ +// -Wb,post_include="ace/post.h" \ +// IOP.pidl // +#ifndef TAO_IOP_PIDL +#define TAO_IOP_PIDL + #pragma prefix "omg.org" module IOP @@ -28,20 +44,14 @@ module IOP typedef sequence<TaggedComponent> MultipleComponentProfile; typedef sequence<TaggedComponent> TaggedComponentList; + // @@ All security related tags are located in the Security Service + // @@ related IDL files, in accordance with the Security Service 1.7 + // @@ specification. + const ComponentId TAG_ORB_TYPE = 0; const ComponentId TAG_CODE_SETS = 1; const ComponentId TAG_POLICIES = 2; const ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3; - const ComponentId TAG_ASSOCIATION_OPTIONS = 13; - const ComponentId TAG_SEC_NAME = 14; - const ComponentId TAG_SPKM_1_SEC_MECH = 15; - const ComponentId TAG_SPKM_2_SEC_MECH = 16; - const ComponentId TAG_KerberosV5_SEC_MECH = 17; - const ComponentId TAG_CSI_ECMA_Secret_SEC_MECH = 18; - const ComponentId TAG_CSI_ECMA_Hybrid_SEC_MECH = 19; - const ComponentId TAG_SSL_SEC_TRANS = 20; - const ComponentId TAG_CSI_ECMA_Public_SEC_MECH = 21; - const ComponentId TAG_GENERIC_SEC_MECH = 22; const ComponentId TAG_COMPLETE_OBJECT_KEY = 5; const ComponentId TAG_ENDPOINT_ID_POSITION = 6; @@ -49,7 +59,6 @@ module IOP const ComponentId TAG_DCE_STRING_BINDING = 100; const ComponentId TAG_DCE_BINDING_NAME = 101; const ComponentId TAG_DCE_NO_PIPES = 102; - const ComponentId TAG_DCE_SEC_MECH = 103; typedef unsigned long ServiceId; struct ServiceContext { @@ -86,3 +95,5 @@ module IOP }; #pragma prefix "" + +#endif /* TAO_IOP_PIDL */ diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 55326405937..ce7089e44d5 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -1,31 +1,33 @@ +// -*- 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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// IOPC.cpp -// -// = DESCRIPTION -// Generated from IOP.pidl, that contains the OMG standarized IOP -// module. -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. -// -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/IOPC.h" -#include "tao/Any.h" -#include "tao/Typecode.h" +#include "IOPC.h" #if !defined (__ACE_INLINE__) -#include "tao/IOPC.i" +#include "IOPC.i" #endif /* !defined INLINE */ +#include "tao/Any.h" +#include "tao/Typecode.h" + static const CORBA::Long _oc_IOP_ProfileId[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -41,11 +43,11 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProfileId, &_tc_TAO_tc_IOP_Profil TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_INTERNET_IOP, 0) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_INTERNET_IOP, 0U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_MULTIPLE_COMPONENTS, 1) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_MULTIPLE_COMPONENTS, 1U) TAO_NAMESPACE_END static const CORBA::Long _oc_IOP_TaggedProfile[] = { @@ -68,7 +70,7 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] = TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_octet, - 0, + 0U, }; static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (CORBA::tk_struct, sizeof (_oc_IOP_TaggedProfile), (char *) &_oc_IOP_TaggedProfile, 0, sizeof (IOP::TaggedProfile)); @@ -76,6 +78,15 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedProfile, &_tc_TAO_tc_IOP_TaggedProfile) TAO_NAMESPACE_END +void IOP::TaggedProfile::_tao_any_destructor (void *x) +{ + TaggedProfile *tmp = ACE_static_cast (TaggedProfile*,x); + delete tmp; +} + + +#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CS_) +#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CS_ // ************************************************************* // IOP::TaggedProfile::_tao_seq_Octet @@ -84,36 +95,42 @@ TAO_NAMESPACE_END IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void) {} IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor {} +void IOP::TaggedProfile::_tao_seq_Octet::_tao_any_destructor (void *x) +{ + _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); + delete tmp; +} + -// **************************************************************** +#endif /* end #if !defined */ static const CORBA::Long _oc_IOP_IOR[] = { @@ -122,8 +139,8 @@ static const CORBA::Long _oc_IOP_IOR[] = 4, ACE_NTOHL (0x494f5200), // name = IOR 2, // member count 8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400), // name = type_id - CORBA::tk_string, - 0, // string length + CORBA::tk_string, + 0U, // string length 9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0), // name = profiles CORBA::tk_sequence, // typecode kind 200, // encapsulation length @@ -149,10 +166,10 @@ static const CORBA::Long _oc_IOP_IOR[] = TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_octet, - 0, + 0U, - 0, + 0U, }; static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (CORBA::tk_struct, sizeof (_oc_IOP_IOR), (char *) &_oc_IOP_IOR, 0, sizeof (IOP::IOR)); @@ -160,6 +177,63 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IOR, &_tc_TAO_tc_IOP_IOR) TAO_NAMESPACE_END +void IOP::IOR::_tao_any_destructor (void *x) +{ + IOR *tmp = ACE_static_cast (IOR*,x); + delete tmp; +} + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_ + + void + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_allocate_buffer (CORBA::ULong length) + { + IOP::TaggedProfile* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (length); + + if (this->buffer_ != 0) + { + IOP::TaggedProfile *old = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old); + + } + this->buffer_ = tmp; + } + + void + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); + this->buffer_ = 0; + } + + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Dtor. + { + this->_deallocate_buffer (); + } + + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_) +#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_ // ************************************************************* // IOP::IOR::_tao_seq_TaggedProfile @@ -168,16 +242,42 @@ TAO_NAMESPACE_END IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) // uses max size - : TAO_Unbounded_Sequence<IOP::TaggedProfile> (max) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedProfile> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile *buffer, CORBA::Boolean release) - : TAO_Unbounded_Sequence<IOP::TaggedProfile> (max, length, buffer, release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedProfile> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) // copy ctor - : TAO_Unbounded_Sequence<IOP::TaggedProfile> (seq) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedProfile> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) {} IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor {} +void IOP::IOR::_tao_seq_TaggedProfile::_tao_any_destructor (void *x) +{ + _tao_seq_TaggedProfile *tmp = ACE_static_cast (_tao_seq_TaggedProfile*,x); + delete tmp; +} + + +#endif /* end #if !defined */ static const CORBA::Long _oc_IOP_ComponentId[] = { @@ -213,7 +313,7 @@ static const CORBA::Long _oc_IOP_TaggedComponent[] = TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_octet, - 0, + 0U, }; static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (CORBA::tk_struct, sizeof (_oc_IOP_TaggedComponent), (char *) &_oc_IOP_TaggedComponent, 0, sizeof (IOP::TaggedComponent)); @@ -221,6 +321,15 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponent, &_tc_TAO_tc_IOP_TaggedComponent) TAO_NAMESPACE_END +void IOP::TaggedComponent::_tao_any_destructor (void *x) +{ + TaggedComponent *tmp = ACE_static_cast (TaggedComponent*,x); + delete tmp; +} + + +#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CS_) +#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CS_ // ************************************************************* // IOP::TaggedComponent::_tao_seq_Octet @@ -229,16 +338,94 @@ TAO_NAMESPACE_END IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void) {} IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : TAO_Unbounded_Sequence<CORBA::Octet> (max) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) {} IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) {} IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : TAO_Unbounded_Sequence<CORBA::Octet> (seq) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) {} IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor {} +void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x) +{ + _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); + delete tmp; +} + + +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_ + + void + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_allocate_buffer (CORBA::ULong length) + { + IOP::TaggedComponent* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (length); + + if (this->buffer_ != 0) + { + IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old); + + } + this->buffer_ = tmp; + } + + void + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); + this->buffer_ = 0; + } + + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Dtor. + { + this->_deallocate_buffer (); + } + + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_) +#define _IOP_MULTIPLECOMPONENTPROFILE_CS_ // ************************************************************* // IOP::MultipleComponentProfile @@ -247,16 +434,42 @@ IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor IOP::MultipleComponentProfile::MultipleComponentProfile (void) {} IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) // uses max size - : TAO_Unbounded_Sequence<IOP::TaggedComponent> (max) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) {} IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release) - : TAO_Unbounded_Sequence<IOP::TaggedComponent> (max, length, buffer, release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) {} IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) // copy ctor - : TAO_Unbounded_Sequence<IOP::TaggedComponent> (seq) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) {} IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor {} +void IOP::MultipleComponentProfile::_tao_any_destructor (void *x) +{ + MultipleComponentProfile *tmp = ACE_static_cast (MultipleComponentProfile*,x); + delete tmp; +} + + +#endif /* end #if !defined */ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] = { @@ -287,10 +500,10 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] = TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_octet, - 0, + 0U, - 0, + 0U, }; static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (CORBA::tk_alias, sizeof (_oc_IOP_MultipleComponentProfile), (char *) &_oc_IOP_MultipleComponentProfile, 0, sizeof (IOP::MultipleComponentProfile)); @@ -298,89 +511,181 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultipleComponentProfile, &_tc_TAO_tc_IOP_MultipleComponentProfile) TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CODE_SETS, 1) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ALTERNATE_IIOP_ADDRESS, 3) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ASSOCIATION_OPTIONS, 13) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SEC_NAME, 14) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SPKM_1_SEC_MECH, 15) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SPKM_2_SEC_MECH, 16) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_KerberosV5_SEC_MECH, 17) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Secret_SEC_MECH, 18) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::ULong) + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_ + + void + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_allocate_buffer (CORBA::ULong length) + { + IOP::TaggedComponent* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (length); + + if (this->buffer_ != 0) + { + IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old); + + } + this->buffer_ = tmp; + } + + void + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); + this->buffer_ = 0; + } + + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Dtor. + { + this->_deallocate_buffer (); + } + + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_) +#define _IOP_TAGGEDCOMPONENTLIST_CS_ + +// ************************************************************* +// IOP::TaggedComponentList +// ************************************************************* + +IOP::TaggedComponentList::TaggedComponentList (void) +{} +IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max) // uses max size + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_TaggedComponentList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) +{} +IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_TaggedComponentList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) +{} +IOP::TaggedComponentList::TaggedComponentList (const TaggedComponentList &seq) // copy ctor + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_TaggedComponentList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) +{} +IOP::TaggedComponentList::~TaggedComponentList (void) // dtor +{} +void IOP::TaggedComponentList::_tao_any_destructor (void *x) +{ + TaggedComponentList *tmp = ACE_static_cast (TaggedComponentList*,x); + delete tmp; +} + + +#endif /* end #if !defined */ + +static const CORBA::Long _oc_IOP_TaggedComponentList[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x6973743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0 + 20, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = TaggedComponentList + CORBA::tk_sequence, // typecode kind + 200, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_struct, // typecode kind + 184, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0 + 16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400), // name = TaggedComponent + 2, // member count + 4, ACE_NTOHL (0x74616700), // name = tag + CORBA::tk_alias, // typecode kind for typedefs + 60, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/ComponentId:1.0 + 12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400), // name = ComponentId + CORBA::tk_ulong, + + + 15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, + + + 0U, + +}; +static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (CORBA::tk_alias, sizeof (_oc_IOP_TaggedComponentList), (char *) &_oc_IOP_TaggedComponentList, 0, sizeof (IOP::TaggedComponentList)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Hybrid_SEC_MECH, 19) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponentList, &_tc_TAO_tc_IOP_TaggedComponentList) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SSL_SEC_TRANS, 20) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Public_SEC_MECH, 21) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CODE_SETS, 1U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GENERIC_SEC_MECH, 22) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_COMPLETE_OBJECT_KEY, 5) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ALTERNATE_IIOP_ADDRESS, 3U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ENDPOINT_ID_POSITION, 6) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_COMPLETE_OBJECT_KEY, 5U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_LOCATION_POLICY, 12) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ENDPOINT_ID_POSITION, 6U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_STRING_BINDING, 100) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_LOCATION_POLICY, 12U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_BINDING_NAME, 101) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_STRING_BINDING, 100U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_NO_PIPES, 102) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_BINDING_NAME, 101U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_SEC_MECH, 103) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_NO_PIPES, 102U) TAO_NAMESPACE_END static const CORBA::Long _oc_IOP_ServiceId[] = { @@ -416,7 +721,7 @@ static const CORBA::Long _oc_IOP_ServiceContext[] = TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_octet, - 0, + 0U, }; static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (CORBA::tk_struct, sizeof (_oc_IOP_ServiceContext), (char *) &_oc_IOP_ServiceContext, 0, sizeof (IOP::ServiceContext)); @@ -424,6 +729,15 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (IOP) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContext, &_tc_TAO_tc_IOP_ServiceContext) TAO_NAMESPACE_END +void IOP::ServiceContext::_tao_any_destructor (void *x) +{ + ServiceContext *tmp = ACE_static_cast (ServiceContext*,x); + delete tmp; +} + + +#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CS_) +#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CS_ // ************************************************************* // IOP::ServiceContext::_tao_seq_Octet @@ -432,16 +746,94 @@ TAO_NAMESPACE_END IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void) {} IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : TAO_Unbounded_Sequence<CORBA::Octet> (max) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) {} IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) {} IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : TAO_Unbounded_Sequence<CORBA::Octet> (seq) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) {} IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor {} +void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x) +{ + _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); + delete tmp; +} + + +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_ + + void + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_allocate_buffer (CORBA::ULong length) + { + IOP::ServiceContext* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (length); + + if (this->buffer_ != 0) + { + IOP::ServiceContext *old = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old); + + } + this->buffer_ = tmp; + } + + void + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_); + + _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); + this->buffer_ = 0; + } + + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Dtor. + { + this->_deallocate_buffer (); + } + + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_SERVICECONTEXTLIST_CS_) +#define _IOP_SERVICECONTEXTLIST_CS_ // ************************************************************* // IOP::ServiceContextList @@ -450,16 +842,42 @@ IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor IOP::ServiceContextList::ServiceContextList (void) {} IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) // uses max size - : TAO_Unbounded_Sequence<IOP::ServiceContext> (max) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_ServiceContextList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::ServiceContext> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) {} IOP::ServiceContextList::ServiceContextList (CORBA::ULong max, CORBA::ULong length, IOP::ServiceContext *buffer, CORBA::Boolean release) - : TAO_Unbounded_Sequence<IOP::ServiceContext> (max, length, buffer, release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_ServiceContextList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::ServiceContext> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) {} IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) // copy ctor - : TAO_Unbounded_Sequence<IOP::ServiceContext> (seq) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_ServiceContextList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IOP::ServiceContext> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) {} IOP::ServiceContextList::~ServiceContextList (void) // dtor {} +void IOP::ServiceContextList::_tao_any_destructor (void *x) +{ + ServiceContextList *tmp = ACE_static_cast (ServiceContextList*,x); + delete tmp; +} + + +#endif /* end #if !defined */ static const CORBA::Long _oc_IOP_ServiceContextList[] = { @@ -490,10 +908,10 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] = TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_octet, - 0, + 0U, - 0, + 0U, }; static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (CORBA::tk_alias, sizeof (_oc_IOP_ServiceContextList), (char *) &_oc_IOP_ServiceContextList, 0, sizeof (IOP::ServiceContextList)); @@ -503,195 +921,144 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContextList, &_tc_TAO_tc_I TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TransactionService, 0) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TransactionService, 0U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, CodeSets, 1) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, CodeSets, 1U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassCheck, 2) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassCheck, 2U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassInfo, 3) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassInfo, 3U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, LogicalThreadId, 4) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, LogicalThreadId, 4U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, BI_DIR_IIOP, 5) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, BI_DIR_IIOP, 5U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, SendingContextRunTime, 6) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, SendingContextRunTime, 6U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 7) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 7U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, UnknownExceptionInfo, 9) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, UnknownExceptionInfo, 9U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriority, 10) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriority, 10U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriorityRange, 11) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriorityRange, 11U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_GROUP, 27) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_GROUP, 27U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_PRIMARY, 28) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_PRIMARY, 28U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_HEARTBEAT_ENABLED, 29) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_HEARTBEAT_ENABLED, 29U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_GROUP_VERSION, 12) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_GROUP_VERSION, 12U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13U) TAO_NAMESPACE_END - void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedProfile &_tao_elem) // copying { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - IOP::_tc_TaggedProfile, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -} - -void IOP::TaggedProfile::_tao_any_destructor (void *x) -{ - IOP::TaggedProfile *tmp = ACE_static_cast(IOP::TaggedProfile*,x); - delete tmp; + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + IOP::_tc_TaggedProfile, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } void operator<<= (CORBA::Any &_tao_any, IOP::TaggedProfile *_tao_elem) // non copying { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - IOP::_tc_TaggedProfile, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - IOP::TaggedProfile::_tao_any_destructor - ); + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IOP::_tc_TaggedProfile, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IOP::TaggedProfile::_tao_any_destructor + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedProfile *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (IOP::_tc_TaggedProfile, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (IOP::TaggedProfile *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, IOP::TaggedProfile, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - IOP::_tc_TaggedProfile, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - IOP::TaggedProfile::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast(const IOP::TaggedProfile*&,_tao_elem); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (IOP::_tc_TaggedProfile, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (IOP::TaggedProfile *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const IOP::TaggedProfile*, + _tao_any.value () + ); return 1; - } + } else { - ACE_NEW_RETURN (_tao_elem, IOP::TaggedProfile, 0); + IOP::TaggedProfile *tmp; + ACE_NEW_RETURN (tmp, IOP::TaggedProfile, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(IOP::TaggedProfile *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( IOP::_tc_TaggedProfile, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (IOP::TaggedProfile *&, _tao_elem)), + ACE_static_cast (void *, tmp), IOP::TaggedProfile::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (IOP::TaggedProfile *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (IOP::TaggedProfile *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -699,130 +1066,80 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile void operator<<= (CORBA::Any &_tao_any, const IOP::IOR &_tao_elem) // copying { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - IOP::_tc_IOR, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -} - -void IOP::IOR::_tao_any_destructor (void *x) -{ - IOP::IOR *tmp = ACE_static_cast(IOP::IOR*,x); - delete tmp; + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + IOP::_tc_IOR, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } void operator<<= (CORBA::Any &_tao_any, IOP::IOR *_tao_elem) // non copying { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - IOP::_tc_IOR, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - IOP::IOR::_tao_any_destructor - ); + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IOP::_tc_IOR, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IOP::IOR::_tao_any_destructor + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::IOR *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (IOP::_tc_IOR, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (IOP::IOR *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, IOP::IOR, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - IOP::_tc_IOR, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - IOP::IOR::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast(const IOP::IOR*&,_tao_elem); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (IOP::_tc_IOR, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (IOP::IOR *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const IOP::IOR*, + _tao_any.value () + ); return 1; - } + } else { - ACE_NEW_RETURN (_tao_elem, IOP::IOR, 0); + IOP::IOR *tmp; + ACE_NEW_RETURN (tmp, IOP::IOR, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(IOP::IOR *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( IOP::_tc_IOR, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (IOP::IOR *&, _tao_elem)), + ACE_static_cast (void *, tmp), IOP::IOR::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (IOP::IOR *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (IOP::IOR *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -830,130 +1147,80 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedComponent &_tao_elem) // copying { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - IOP::_tc_TaggedComponent, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -} - -void IOP::TaggedComponent::_tao_any_destructor (void *x) -{ - IOP::TaggedComponent *tmp = ACE_static_cast(IOP::TaggedComponent*,x); - delete tmp; + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + IOP::_tc_TaggedComponent, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponent *_tao_elem) // non copying { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - IOP::_tc_TaggedComponent, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - IOP::TaggedComponent::_tao_any_destructor - ); + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IOP::_tc_TaggedComponent, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IOP::TaggedComponent::_tao_any_destructor + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponent *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (IOP::_tc_TaggedComponent, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (IOP::TaggedComponent *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, IOP::TaggedComponent, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - IOP::_tc_TaggedComponent, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - IOP::TaggedComponent::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast(const IOP::TaggedComponent*&,_tao_elem); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedComponent *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (IOP::_tc_TaggedComponent, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (IOP::TaggedComponent *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const IOP::TaggedComponent*, + _tao_any.value () + ); return 1; - } + } else { - ACE_NEW_RETURN (_tao_elem, IOP::TaggedComponent, 0); + IOP::TaggedComponent *tmp; + ACE_NEW_RETURN (tmp, IOP::TaggedComponent, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(IOP::TaggedComponent *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( IOP::_tc_TaggedComponent, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (IOP::TaggedComponent *&, _tao_elem)), + ACE_static_cast (void *, tmp), IOP::TaggedComponent::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (IOP::TaggedComponent *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (IOP::TaggedComponent *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -964,263 +1231,255 @@ void operator<<= ( const IOP::MultipleComponentProfile &_tao_elem ) // copying { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - IOP::_tc_MultipleComponentProfile, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void IOP::MultipleComponentProfile::_tao_any_destructor (void *x) -{ - IOP::MultipleComponentProfile *tmp = ACE_static_cast(IOP::MultipleComponentProfile*,x); - delete tmp; -} - -void operator<<= (CORBA::Any &_tao_any, IOP::MultipleComponentProfile *_tao_elem) // non copying -{ - TAO_OutputCDR stream; - stream << *_tao_elem; + TAO_OutputCDR stream; + if (stream << _tao_elem) + { _tao_any._tao_replace ( IOP::_tc_MultipleComponentProfile, TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - IOP::MultipleComponentProfile::_tao_any_destructor + stream.begin () ); + } +} + +void operator<<= (CORBA::Any &_tao_any, IOP::MultipleComponentProfile *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IOP::_tc_MultipleComponentProfile, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IOP::MultipleComponentProfile::_tao_any_destructor + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::MultipleComponentProfile *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (IOP::MultipleComponentProfile *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, IOP::MultipleComponentProfile, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - IOP::_tc_MultipleComponentProfile, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - IOP::MultipleComponentProfile::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast( + const IOP::MultipleComponentProfile*&, + _tao_elem + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleComponentProfile *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (IOP::MultipleComponentProfile *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const IOP::MultipleComponentProfile*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, IOP::MultipleComponentProfile, 0); + IOP::MultipleComponentProfile *tmp; + ACE_NEW_RETURN (tmp, IOP::MultipleComponentProfile, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(IOP::MultipleComponentProfile *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( IOP::_tc_MultipleComponentProfile, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (IOP::MultipleComponentProfile *&, _tao_elem)), + ACE_static_cast (void *, tmp), IOP::MultipleComponentProfile::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (IOP::MultipleComponentProfile *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (IOP::MultipleComponentProfile *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -void operator<<= (CORBA::Any &_tao_any, const IOP::ServiceContext &_tao_elem) // copying +void operator<<= ( + CORBA::Any &_tao_any, + const IOP::TaggedComponentList &_tao_elem + ) // copying { - TAO_OutputCDR stream; - stream << _tao_elem; + TAO_OutputCDR stream; + if (stream << _tao_elem) + { _tao_any._tao_replace ( - IOP::_tc_ServiceContext, + IOP::_tc_TaggedComponentList, TAO_ENCAP_BYTE_ORDER, stream.begin () ); + } } -void IOP::ServiceContext::_tao_any_destructor (void *x) +void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponentList *_tao_elem) // non copying { - IOP::ServiceContext *tmp = ACE_static_cast(IOP::ServiceContext*,x); - delete tmp; + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IOP::_tc_TaggedComponentList, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IOP::TaggedComponentList::_tao_any_destructor + ); } -void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContext *_tao_elem) // non copying +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponentList *&_tao_elem) { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - IOP::_tc_ServiceContext, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - IOP::ServiceContext::_tao_any_destructor - ); + return _tao_any >>= ACE_const_cast( + const IOP::TaggedComponentList*&, + _tao_elem + ); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContext *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedComponentList *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (IOP::_tc_ServiceContext, ACE_TRY_ENV)) // not equal + if (!type->equivalent (IOP::_tc_TaggedComponentList, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (IOP::ServiceContext *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const IOP::TaggedComponentList*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, IOP::ServiceContext, 0); + IOP::TaggedComponentList *tmp; + ACE_NEW_RETURN (tmp, IOP::TaggedComponentList, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( - IOP::_tc_ServiceContext, + IOP::_tc_TaggedComponentList, 1, - ACE_reinterpret_cast (void *, _tao_elem), - IOP::ServiceContext::_tao_any_destructor + ACE_static_cast (void *, tmp), + IOP::TaggedComponentList::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } +void operator<<= (CORBA::Any &_tao_any, const IOP::ServiceContext &_tao_elem) // copying +{ + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + IOP::_tc_ServiceContext, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); +} + +void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContext *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IOP::_tc_ServiceContext, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IOP::ServiceContext::_tao_any_destructor + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContext *&_tao_elem) +{ + return _tao_any >>= ACE_const_cast(const IOP::ServiceContext*&,_tao_elem); +} + CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContext *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (IOP::_tc_ServiceContext, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (IOP::ServiceContext *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const IOP::ServiceContext*, + _tao_any.value () + ); return 1; - } + } else { - ACE_NEW_RETURN (_tao_elem, IOP::ServiceContext, 0); + IOP::ServiceContext *tmp; + ACE_NEW_RETURN (tmp, IOP::ServiceContext, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(IOP::ServiceContext *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( IOP::_tc_ServiceContext, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (IOP::ServiceContext *&, _tao_elem)), + ACE_static_cast (void *, tmp), IOP::ServiceContext::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (IOP::ServiceContext *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (IOP::ServiceContext *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -1231,137 +1490,94 @@ void operator<<= ( const IOP::ServiceContextList &_tao_elem ) // copying { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - IOP::_tc_ServiceContextList, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void IOP::ServiceContextList::_tao_any_destructor (void *x) -{ - IOP::ServiceContextList *tmp = ACE_static_cast(IOP::ServiceContextList*,x); - delete tmp; -} - -void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContextList *_tao_elem) // non copying -{ - TAO_OutputCDR stream; - stream << *_tao_elem; + TAO_OutputCDR stream; + if (stream << _tao_elem) + { _tao_any._tao_replace ( IOP::_tc_ServiceContextList, TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - IOP::ServiceContextList::_tao_any_destructor + stream.begin () ); + } +} + +void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContextList *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IOP::_tc_ServiceContextList, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IOP::ServiceContextList::_tao_any_destructor + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContextList *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (IOP::_tc_ServiceContextList, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (IOP::ServiceContextList *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, IOP::ServiceContextList, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - IOP::_tc_ServiceContextList, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - IOP::ServiceContextList::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast( + const IOP::ServiceContextList*&, + _tao_elem + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContextList *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (IOP::_tc_ServiceContextList, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (IOP::ServiceContextList *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const IOP::ServiceContextList*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, IOP::ServiceContextList, 0); + IOP::ServiceContextList *tmp; + ACE_NEW_RETURN (tmp, IOP::ServiceContextList, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(IOP::ServiceContextList *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( IOP::_tc_ServiceContextList, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (IOP::ServiceContextList *&, _tao_elem)), + ACE_static_cast (void *, tmp), IOP::ServiceContextList::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (IOP::ServiceContextList *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (IOP::ServiceContextList *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } + +#if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_ +#define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_ + CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const IOP::TaggedProfile::_tao_seq_Octet &_tao_sequence @@ -1370,20 +1586,20 @@ CORBA::Boolean operator<< ( if (strm << _tao_sequence.length ()) { // encode all elements - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence); + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -1399,13 +1615,16 @@ CORBA::Boolean operator>> ( { // 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 - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); strm.skip_bytes (_tao_seq_len); @@ -1413,15 +1632,21 @@ CORBA::Boolean operator>> ( } else return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error } +#endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_ */ + + +#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_ +#define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_ + CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const IOP::IOR::_tao_seq_TaggedProfile &_tao_sequence @@ -1432,7 +1657,9 @@ CORBA::Boolean operator<< ( // 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 @@ -1448,15 +1675,26 @@ CORBA::Boolean operator>> ( { // 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 } +#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_ */ + + +#if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_ +#define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_ + CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const IOP::TaggedComponent::_tao_seq_Octet &_tao_sequence @@ -1465,20 +1703,20 @@ CORBA::Boolean operator<< ( if (strm << _tao_sequence.length ()) { // encode all elements - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence); + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -1494,13 +1732,16 @@ CORBA::Boolean operator>> ( { // 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 - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); strm.skip_bytes (_tao_seq_len); @@ -1508,15 +1749,17 @@ CORBA::Boolean operator>> ( } else return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error } +#endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_ */ + CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const IOP::MultipleComponentProfile &_tao_sequence @@ -1527,7 +1770,9 @@ CORBA::Boolean operator<< ( // 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 @@ -1543,10 +1788,15 @@ CORBA::Boolean operator>> ( { // 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 @@ -1554,26 +1804,72 @@ CORBA::Boolean operator>> ( CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const IOP::ServiceContext::_tao_seq_Octet &_tao_sequence + const IOP::TaggedComponentList &_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, + IOP::TaggedComponentList &_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 +} + +#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_ +#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const IOP::ServiceContext::_tao_seq_Octet &_tao_sequence + ) +{ + if (strm << _tao_sequence.length ()) + { + // encode all elements + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence); + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error @@ -1589,13 +1885,16 @@ CORBA::Boolean operator>> ( { // 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 - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); strm.skip_bytes (_tao_seq_len); @@ -1603,15 +1902,17 @@ CORBA::Boolean operator>> ( } else return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } return 0; // error } +#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_ */ + CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const IOP::ServiceContextList &_tao_sequence @@ -1622,7 +1923,9 @@ CORBA::Boolean operator<< ( // 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 @@ -1638,11 +1941,17 @@ CORBA::Boolean operator>> ( { // 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/IOPC.h b/TAO/tao/IOPC.h index 8eb6319734a..c7d6b1edf6d 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -1,40 +1,49 @@ -/* -*- C++ -*- */ +// -*- 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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// IOPC.h -// -// = DESCRIPTION -// Generated from IOP.pidl, that contains the OMG standarized IOP -// module. -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. -// -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef TAO_IOPC_H -#define TAO_IOPC_H -#include "ace/pre.h" +#ifndef _TAO_IDL_IOPC_H_ +#define _TAO_IDL_IOPC_H_ -#include "tao/CDR.h" -#include "tao/Sequence.h" +#include "ace/pre.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/CDR.h" +#include "tao/Sequence.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) @@ -52,25 +61,54 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_MULTIPLE_COMPONENTS; + struct TaggedProfile; + class TaggedProfile_var; + struct TAO_Export TaggedProfile { + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef TaggedProfile_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + static void _tao_any_destructor (void*); - ProfileId tag; + ACE_NESTED_CLASS (IOP, ProfileId) tag; + +#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_) +#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_ - class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet> + class _tao_seq_Octet; + class _tao_seq_Octet_var; + + // ************************************************************* + // _tao_seq_Octet + // ************************************************************* + + class TAO_Export _tao_seq_Octet : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_Octet (void); // default ctor _tao_seq_Octet (CORBA::ULong max); // uses max size _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, CORBA::Boolean release=0 ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor - ~_tao_seq_Octet (void); // dtor + ~_tao_seq_Octet (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) _tao_seq_Octet ( @@ -81,8 +119,82 @@ TAO_NAMESPACE IOP #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ }; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET___VAR_CH_) +#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET___VAR_CH_ + + // ************************************************************* + // class IOP::TaggedProfile::_tao_seq_Octet_var + // ************************************************************* + + class TAO_Export _tao_seq_Octet_var + { + public: + _tao_seq_Octet_var (void); // default constructor + _tao_seq_Octet_var (_tao_seq_Octet *); + _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor + _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only + ~_tao_seq_Octet_var (void); // destructor + + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only + _tao_seq_Octet *operator-> (void); + const _tao_seq_Octet *operator-> (void) const; + + operator const _tao_seq_Octet &() const; + operator _tao_seq_Octet &(); + operator _tao_seq_Octet &() const; + + CORBA::Octet &operator[] (CORBA::ULong index); + // in, inout, out, _retn + const _tao_seq_Octet &in (void) const; + _tao_seq_Octet &inout (void); + _tao_seq_Octet *&out (void); + _tao_seq_Octet *_retn (void); + _tao_seq_Octet *ptr (void) const; + + private: + _tao_seq_Octet *ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET___OUT_CH_) +#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET___OUT_CH_ + + class TAO_Export _tao_seq_Octet_out + { + public: + _tao_seq_Octet_out (_tao_seq_Octet *&); + _tao_seq_Octet_out (_tao_seq_Octet_var &); + _tao_seq_Octet_out (const _tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (_tao_seq_Octet *); + operator _tao_seq_Octet *&(); + _tao_seq_Octet *&ptr (void); + _tao_seq_Octet *operator-> (void); + CORBA::Octet &operator[] (CORBA::ULong index); + + private: + _tao_seq_Octet *&ptr_; + // assignment from T_var not allowed + void operator= (const _tao_seq_Octet_var &); + }; + - _tao_seq_Octet profile_data; +#endif /* end #if !defined */ + +#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet _profile_data_seq; + #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + _tao_seq_Octet profile_data; }; class TAO_Export TaggedProfile_var @@ -92,16 +204,18 @@ TAO_NAMESPACE IOP TaggedProfile_var (TaggedProfile *); TaggedProfile_var (const TaggedProfile_var &); // copy constructor ~TaggedProfile_var (void); // destructor - + TaggedProfile_var &operator= (TaggedProfile *); TaggedProfile_var &operator= (const TaggedProfile_var &); TaggedProfile *operator-> (void); const TaggedProfile *operator-> (void) const; - + operator const TaggedProfile &() const; operator TaggedProfile &(); operator TaggedProfile &() const; - // in, inout, out, _retn + operator TaggedProfile *&(); // variable-size types only + + // in, inout, out, _retn const TaggedProfile &in (void) const; TaggedProfile &inout (void); TaggedProfile *&out (void); @@ -123,7 +237,7 @@ TAO_NAMESPACE IOP operator TaggedProfile *&(); TaggedProfile *&ptr (void); TaggedProfile *operator-> (void); - + private: TaggedProfile *&ptr_; // assignment from T_var not allowed @@ -132,34 +246,172 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedProfile; + struct IOR; + class IOR_var; + struct TAO_Export IOR { + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef IOR_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + static void _tao_any_destructor (void*); TAO_String_Manager type_id; +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_ + + class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); // Default constructor. + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum, + CORBA::ULong length, + ACE_NESTED_CLASS (IOP, TaggedProfile) *data, + CORBA::Boolean release = 0); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &operator= (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs); + virtual ~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); // Dtor. + // = Accessors. + ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i); + const ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i) const; + // = Static operations. + static ACE_NESTED_CLASS (IOP, TaggedProfile) *allocbuf (CORBA::ULong size); + static void freebuf (ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer); + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (CORBA::Boolean orphan = 0); + const ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (void) const; + void replace (CORBA::ULong max, + CORBA::ULong length, + ACE_NESTED_CLASS (IOP, TaggedProfile) *data, + CORBA::Boolean release); + }; + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_) +#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_ + class _tao_seq_TaggedProfile; + class _tao_seq_TaggedProfile_var; + // ************************************************************* // _tao_seq_TaggedProfile // ************************************************************* - - class TAO_Export _tao_seq_TaggedProfile : public TAO_Unbounded_Sequence<TaggedProfile> + + class TAO_Export _tao_seq_TaggedProfile : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ACE_NESTED_CLASS (IOP, TaggedProfile)> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_TaggedProfile (void); // default ctor _tao_seq_TaggedProfile (CORBA::ULong max); // uses max size _tao_seq_TaggedProfile ( - CORBA::ULong max, - CORBA::ULong length, - TaggedProfile *buffer, + CORBA::ULong max, + CORBA::ULong length, + ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer, CORBA::Boolean release=0 ); _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); // copy ctor - ~_tao_seq_TaggedProfile (void); // dtor + ~_tao_seq_TaggedProfile (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_TaggedProfile_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + }; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE___VAR_CH_) +#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE___VAR_CH_ + + // ************************************************************* + // class IOP::IOR::_tao_seq_TaggedProfile_var + // ************************************************************* + + class TAO_Export _tao_seq_TaggedProfile_var + { + public: + _tao_seq_TaggedProfile_var (void); // default constructor + _tao_seq_TaggedProfile_var (_tao_seq_TaggedProfile *); + _tao_seq_TaggedProfile_var (const _tao_seq_TaggedProfile_var &); // copy constructor + ~_tao_seq_TaggedProfile_var (void); // destructor + + _tao_seq_TaggedProfile_var &operator= (_tao_seq_TaggedProfile *); + _tao_seq_TaggedProfile_var &operator= (const _tao_seq_TaggedProfile_var &); + _tao_seq_TaggedProfile *operator-> (void); + const _tao_seq_TaggedProfile *operator-> (void) const; + + operator const _tao_seq_TaggedProfile &() const; + operator _tao_seq_TaggedProfile &(); + operator _tao_seq_TaggedProfile &() const; + operator _tao_seq_TaggedProfile *&(); // variable-size base types only + + ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong index); + // in, inout, out, _retn + const _tao_seq_TaggedProfile &in (void) const; + _tao_seq_TaggedProfile &inout (void); + _tao_seq_TaggedProfile *&out (void); + _tao_seq_TaggedProfile *_retn (void); + _tao_seq_TaggedProfile *ptr (void) const; + + private: + _tao_seq_TaggedProfile *ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE___OUT_CH_) +#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE___OUT_CH_ + + class TAO_Export _tao_seq_TaggedProfile_out + { + public: + _tao_seq_TaggedProfile_out (_tao_seq_TaggedProfile *&); + _tao_seq_TaggedProfile_out (_tao_seq_TaggedProfile_var &); + _tao_seq_TaggedProfile_out (const _tao_seq_TaggedProfile_out &); + _tao_seq_TaggedProfile_out &operator= (const _tao_seq_TaggedProfile_out &); + _tao_seq_TaggedProfile_out &operator= (_tao_seq_TaggedProfile *); + operator _tao_seq_TaggedProfile *&(); + _tao_seq_TaggedProfile *&ptr (void); + _tao_seq_TaggedProfile *operator-> (void); + ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong index); + + private: + _tao_seq_TaggedProfile *&ptr_; + // assignment from T_var not allowed + void operator= (const _tao_seq_TaggedProfile_var &); }; - typedef _tao_seq_TaggedProfile *_tao_seq_TaggedProfile_ptr; - _tao_seq_TaggedProfile profiles; + +#endif /* end #if !defined */ + +#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_TaggedProfile _profiles_seq; + #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + _tao_seq_TaggedProfile profiles; }; class TAO_Export IOR_var @@ -169,16 +421,18 @@ TAO_NAMESPACE IOP IOR_var (IOR *); IOR_var (const IOR_var &); // copy constructor ~IOR_var (void); // destructor - + IOR_var &operator= (IOR *); IOR_var &operator= (const IOR_var &); IOR *operator-> (void); const IOR *operator-> (void) const; - + operator const IOR &() const; operator IOR &(); operator IOR &() const; - // in, inout, out, _retn + operator IOR *&(); // variable-size types only + + // in, inout, out, _retn const IOR &in (void) const; IOR &inout (void); IOR *&out (void); @@ -200,7 +454,7 @@ TAO_NAMESPACE IOP operator IOR *&(); IOR *&ptr (void); IOR *operator-> (void); - + private: IOR *&ptr_; // assignment from T_var not allowed @@ -213,25 +467,54 @@ TAO_NAMESPACE IOP typedef CORBA::ULong_out ComponentId_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentId; + struct TaggedComponent; + class TaggedComponent_var; + struct TAO_Export TaggedComponent { + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef TaggedComponent_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + static void _tao_any_destructor (void*); - ComponentId tag; + ACE_NESTED_CLASS (IOP, ComponentId) tag; + +#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_) +#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_ - class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet> + class _tao_seq_Octet; + class _tao_seq_Octet_var; + + // ************************************************************* + // _tao_seq_Octet + // ************************************************************* + + class TAO_Export _tao_seq_Octet : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_Octet (void); // default ctor _tao_seq_Octet (CORBA::ULong max); // uses max size _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, CORBA::Boolean release=0 ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor - ~_tao_seq_Octet (void); // dtor + ~_tao_seq_Octet (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) _tao_seq_Octet ( @@ -242,8 +525,82 @@ TAO_NAMESPACE IOP #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ }; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET___VAR_CH_) +#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET___VAR_CH_ + + // ************************************************************* + // class IOP::TaggedComponent::_tao_seq_Octet_var + // ************************************************************* + + class TAO_Export _tao_seq_Octet_var + { + public: + _tao_seq_Octet_var (void); // default constructor + _tao_seq_Octet_var (_tao_seq_Octet *); + _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor + _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only + ~_tao_seq_Octet_var (void); // destructor + + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only + _tao_seq_Octet *operator-> (void); + const _tao_seq_Octet *operator-> (void) const; + + operator const _tao_seq_Octet &() const; + operator _tao_seq_Octet &(); + operator _tao_seq_Octet &() const; + + CORBA::Octet &operator[] (CORBA::ULong index); + // in, inout, out, _retn + const _tao_seq_Octet &in (void) const; + _tao_seq_Octet &inout (void); + _tao_seq_Octet *&out (void); + _tao_seq_Octet *_retn (void); + _tao_seq_Octet *ptr (void) const; + + private: + _tao_seq_Octet *ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET___OUT_CH_) +#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET___OUT_CH_ + + class TAO_Export _tao_seq_Octet_out + { + public: + _tao_seq_Octet_out (_tao_seq_Octet *&); + _tao_seq_Octet_out (_tao_seq_Octet_var &); + _tao_seq_Octet_out (const _tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (_tao_seq_Octet *); + operator _tao_seq_Octet *&(); + _tao_seq_Octet *&ptr (void); + _tao_seq_Octet *operator-> (void); + CORBA::Octet &operator[] (CORBA::ULong index); + + private: + _tao_seq_Octet *&ptr_; + // assignment from T_var not allowed + void operator= (const _tao_seq_Octet_var &); + }; + + +#endif /* end #if !defined */ + +#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet _component_data_seq; + #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ - _tao_seq_Octet component_data; + _tao_seq_Octet component_data; }; class TAO_Export TaggedComponent_var @@ -253,16 +610,18 @@ TAO_NAMESPACE IOP TaggedComponent_var (TaggedComponent *); TaggedComponent_var (const TaggedComponent_var &); // copy constructor ~TaggedComponent_var (void); // destructor - + TaggedComponent_var &operator= (TaggedComponent *); TaggedComponent_var &operator= (const TaggedComponent_var &); TaggedComponent *operator-> (void); const TaggedComponent *operator-> (void) const; - + operator const TaggedComponent &() const; operator TaggedComponent &(); operator TaggedComponent &() const; - // in, inout, out, _retn + operator TaggedComponent *&(); // variable-size types only + + // in, inout, out, _retn const TaggedComponent &in (void) const; TaggedComponent &inout (void); TaggedComponent *&out (void); @@ -284,7 +643,7 @@ TAO_NAMESPACE IOP operator TaggedComponent *&(); TaggedComponent *&ptr (void); TaggedComponent *operator-> (void); - + private: TaggedComponent *&ptr_; // assignment from T_var not allowed @@ -293,23 +652,90 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponent; - class TAO_Export MultipleComponentProfile : public TAO_Unbounded_Sequence<TaggedComponent> + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_ + + class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); // Default constructor. + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum, + CORBA::ULong length, + TaggedComponent *data, + CORBA::Boolean release = 0); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &operator= (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs); + virtual ~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); // Dtor. + // = Accessors. + TaggedComponent &operator[] (CORBA::ULong i); + const TaggedComponent &operator[] (CORBA::ULong i) const; + // = Static operations. + static TaggedComponent *allocbuf (CORBA::ULong size); + static void freebuf (TaggedComponent *buffer); + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); + const TaggedComponent *get_buffer (void) const; + void replace (CORBA::ULong max, + CORBA::ULong length, + TaggedComponent *data, + CORBA::Boolean release); + }; + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_) +#define _IOP_MULTIPLECOMPONENTPROFILE_CH_ + + class MultipleComponentProfile; + class MultipleComponentProfile_var; + + // ************************************************************* + // MultipleComponentProfile + // ************************************************************* + + class TAO_Export MultipleComponentProfile : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: MultipleComponentProfile (void); // default ctor MultipleComponentProfile (CORBA::ULong max); // uses max size MultipleComponentProfile ( - CORBA::ULong max, - CORBA::ULong length, - TaggedComponent *buffer, + CORBA::ULong max, + CORBA::ULong length, + TaggedComponent *buffer, CORBA::Boolean release=0 ); MultipleComponentProfile (const MultipleComponentProfile &); // copy ctor - ~MultipleComponentProfile (void); // dtor - + ~MultipleComponentProfile (void); static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef MultipleComponentProfile_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + }; - typedef MultipleComponentProfile *MultipleComponentProfile_ptr; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_MULTIPLECOMPONENTPROFILE___VAR_CH_) +#define _IOP_MULTIPLECOMPONENTPROFILE___VAR_CH_ // ************************************************************* // class IOP::MultipleComponentProfile_var @@ -322,17 +748,19 @@ TAO_NAMESPACE IOP MultipleComponentProfile_var (MultipleComponentProfile *); MultipleComponentProfile_var (const MultipleComponentProfile_var &); // copy constructor ~MultipleComponentProfile_var (void); // destructor - + MultipleComponentProfile_var &operator= (MultipleComponentProfile *); MultipleComponentProfile_var &operator= (const MultipleComponentProfile_var &); MultipleComponentProfile *operator-> (void); const MultipleComponentProfile *operator-> (void) const; - + operator const MultipleComponentProfile &() const; operator MultipleComponentProfile &(); operator MultipleComponentProfile &() const; + operator MultipleComponentProfile *&(); // variable-size base types only + TaggedComponent &operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const MultipleComponentProfile &in (void) const; MultipleComponentProfile &inout (void); MultipleComponentProfile *&out (void); @@ -343,6 +771,13 @@ TAO_NAMESPACE IOP MultipleComponentProfile *ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_MULTIPLECOMPONENTPROFILE___OUT_CH_) +#define _IOP_MULTIPLECOMPONENTPROFILE___OUT_CH_ + class TAO_Export MultipleComponentProfile_out { public: @@ -355,42 +790,175 @@ TAO_NAMESPACE IOP MultipleComponentProfile *&ptr (void); MultipleComponentProfile *operator-> (void); TaggedComponent &operator[] (CORBA::ULong index); - + private: MultipleComponentProfile *&ptr_; // assignment from T_var not allowed void operator= (const MultipleComponentProfile_var &); }; + +#endif /* end #if !defined */ + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MultipleComponentProfile; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ORB_TYPE; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CODE_SETS; +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_ - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES; + class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentList : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + + _TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); // Default constructor. + _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum, + CORBA::ULong length, + TaggedComponent *data, + CORBA::Boolean release = 0); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList &operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs); + virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); // Dtor. + // = Accessors. + TaggedComponent &operator[] (CORBA::ULong i); + const TaggedComponent &operator[] (CORBA::ULong i) const; + // = Static operations. + static TaggedComponent *allocbuf (CORBA::ULong size); + static void freebuf (TaggedComponent *buffer); + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); + const TaggedComponent *get_buffer (void) const; + void replace (CORBA::ULong max, + CORBA::ULong length, + TaggedComponent *data, + CORBA::Boolean release); + }; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ALTERNATE_IIOP_ADDRESS; +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_) +#define _IOP_TAGGEDCOMPONENTLIST_CH_ + + class TaggedComponentList; + class TaggedComponentList_var; + + // ************************************************************* + // TaggedComponentList + // ************************************************************* + + class TAO_Export TaggedComponentList : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_TaggedComponentList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + TaggedComponentList (void); // default ctor + TaggedComponentList (CORBA::ULong max); // uses max size + TaggedComponentList ( + CORBA::ULong max, + CORBA::ULong length, + TaggedComponent *buffer, + CORBA::Boolean release=0 + ); + TaggedComponentList (const TaggedComponentList &); // copy ctor + ~TaggedComponentList (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef TaggedComponentList_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + }; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_TAGGEDCOMPONENTLIST___VAR_CH_) +#define _IOP_TAGGEDCOMPONENTLIST___VAR_CH_ + + // ************************************************************* + // class IOP::TaggedComponentList_var + // ************************************************************* + + class TAO_Export TaggedComponentList_var + { + public: + TaggedComponentList_var (void); // default constructor + TaggedComponentList_var (TaggedComponentList *); + TaggedComponentList_var (const TaggedComponentList_var &); // copy constructor + ~TaggedComponentList_var (void); // destructor + + TaggedComponentList_var &operator= (TaggedComponentList *); + TaggedComponentList_var &operator= (const TaggedComponentList_var &); + TaggedComponentList *operator-> (void); + const TaggedComponentList *operator-> (void) const; + + operator const TaggedComponentList &() const; + operator TaggedComponentList &(); + operator TaggedComponentList &() const; + operator TaggedComponentList *&(); // variable-size base types only + + TaggedComponent &operator[] (CORBA::ULong index); + // in, inout, out, _retn + const TaggedComponentList &in (void) const; + TaggedComponentList &inout (void); + TaggedComponentList *&out (void); + TaggedComponentList *_retn (void); + TaggedComponentList *ptr (void) const; + + private: + TaggedComponentList *ptr_; + }; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ASSOCIATION_OPTIONS; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SEC_NAME; +#endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SPKM_1_SEC_MECH; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SPKM_2_SEC_MECH; +#if !defined (_IOP_TAGGEDCOMPONENTLIST___OUT_CH_) +#define _IOP_TAGGEDCOMPONENTLIST___OUT_CH_ - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_KerberosV5_SEC_MECH; + class TAO_Export TaggedComponentList_out + { + public: + TaggedComponentList_out (TaggedComponentList *&); + TaggedComponentList_out (TaggedComponentList_var &); + TaggedComponentList_out (const TaggedComponentList_out &); + TaggedComponentList_out &operator= (const TaggedComponentList_out &); + TaggedComponentList_out &operator= (TaggedComponentList *); + operator TaggedComponentList *&(); + TaggedComponentList *&ptr (void); + TaggedComponentList *operator-> (void); + TaggedComponent &operator[] (CORBA::ULong index); + + private: + TaggedComponentList *&ptr_; + // assignment from T_var not allowed + void operator= (const TaggedComponentList_var &); + }; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Secret_SEC_MECH; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Hybrid_SEC_MECH; +#endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SSL_SEC_TRANS; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponentList; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Public_SEC_MECH; + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ORB_TYPE; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GENERIC_SEC_MECH; + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CODE_SETS; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ALTERNATE_IIOP_ADDRESS; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_COMPLETE_OBJECT_KEY; @@ -404,35 +972,58 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_NO_PIPES; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_SEC_MECH; - typedef CORBA::ULong ServiceId; typedef CORBA::ULong_out ServiceId_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceId; + struct ServiceContext; + class ServiceContext_var; + struct TAO_Export ServiceContext { + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef ServiceContext_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + static void _tao_any_destructor (void*); - ServiceId context_id; + ACE_NESTED_CLASS (IOP, ServiceId) context_id; + +#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_) +#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_ + class _tao_seq_Octet; + class _tao_seq_Octet_var; + // ************************************************************* // _tao_seq_Octet // ************************************************************* - - class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet> + + class TAO_Export _tao_seq_Octet : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_Octet (void); // default ctor _tao_seq_Octet (CORBA::ULong max); // uses max size _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, CORBA::Boolean release=0 ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor - ~_tao_seq_Octet (void); // dtor + ~_tao_seq_Octet (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) _tao_seq_Octet ( @@ -443,8 +1034,82 @@ TAO_NAMESPACE IOP #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ }; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET___VAR_CH_) +#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET___VAR_CH_ + + // ************************************************************* + // class IOP::ServiceContext::_tao_seq_Octet_var + // ************************************************************* + + class TAO_Export _tao_seq_Octet_var + { + public: + _tao_seq_Octet_var (void); // default constructor + _tao_seq_Octet_var (_tao_seq_Octet *); + _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor + _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only + ~_tao_seq_Octet_var (void); // destructor + + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only + _tao_seq_Octet *operator-> (void); + const _tao_seq_Octet *operator-> (void) const; + + operator const _tao_seq_Octet &() const; + operator _tao_seq_Octet &(); + operator _tao_seq_Octet &() const; + + CORBA::Octet &operator[] (CORBA::ULong index); + // in, inout, out, _retn + const _tao_seq_Octet &in (void) const; + _tao_seq_Octet &inout (void); + _tao_seq_Octet *&out (void); + _tao_seq_Octet *_retn (void); + _tao_seq_Octet *ptr (void) const; + + private: + _tao_seq_Octet *ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET___OUT_CH_) +#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET___OUT_CH_ - _tao_seq_Octet context_data; + class TAO_Export _tao_seq_Octet_out + { + public: + _tao_seq_Octet_out (_tao_seq_Octet *&); + _tao_seq_Octet_out (_tao_seq_Octet_var &); + _tao_seq_Octet_out (const _tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (_tao_seq_Octet *); + operator _tao_seq_Octet *&(); + _tao_seq_Octet *&ptr (void); + _tao_seq_Octet *operator-> (void); + CORBA::Octet &operator[] (CORBA::ULong index); + + private: + _tao_seq_Octet *&ptr_; + // assignment from T_var not allowed + void operator= (const _tao_seq_Octet_var &); + }; + + +#endif /* end #if !defined */ + +#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet _context_data_seq; + #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + _tao_seq_Octet context_data; }; class TAO_Export ServiceContext_var @@ -454,16 +1119,18 @@ TAO_NAMESPACE IOP ServiceContext_var (ServiceContext *); ServiceContext_var (const ServiceContext_var &); // copy constructor ~ServiceContext_var (void); // destructor - + ServiceContext_var &operator= (ServiceContext *); ServiceContext_var &operator= (const ServiceContext_var &); ServiceContext *operator-> (void); const ServiceContext *operator-> (void) const; - + operator const ServiceContext &() const; operator ServiceContext &(); operator ServiceContext &() const; - // in, inout, out, _retn + operator ServiceContext *&(); // variable-size types only + + // in, inout, out, _retn const ServiceContext &in (void) const; ServiceContext &inout (void); ServiceContext *&out (void); @@ -485,7 +1152,7 @@ TAO_NAMESPACE IOP operator ServiceContext *&(); ServiceContext *&ptr (void); ServiceContext *operator-> (void); - + private: ServiceContext *&ptr_; // assignment from T_var not allowed @@ -494,23 +1161,90 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceContext; - class TAO_Export ServiceContextList : public TAO_Unbounded_Sequence<ServiceContext> + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_ + + class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_ServiceContextList : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + + _TAO_Unbounded_Sequence_IOP_ServiceContextList (void); // Default constructor. + _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum, + CORBA::ULong length, + ServiceContext *data, + CORBA::Boolean release = 0); + _TAO_Unbounded_Sequence_IOP_ServiceContextList (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs); + _TAO_Unbounded_Sequence_IOP_ServiceContextList &operator= (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs); + virtual ~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void); // Dtor. + // = Accessors. + ServiceContext &operator[] (CORBA::ULong i); + const ServiceContext &operator[] (CORBA::ULong i) const; + // = Static operations. + static ServiceContext *allocbuf (CORBA::ULong size); + static void freebuf (ServiceContext *buffer); + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ServiceContext *get_buffer (CORBA::Boolean orphan = 0); + const ServiceContext *get_buffer (void) const; + void replace (CORBA::ULong max, + CORBA::ULong length, + ServiceContext *data, + CORBA::Boolean release); + }; + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_SERVICECONTEXTLIST_CH_) +#define _IOP_SERVICECONTEXTLIST_CH_ + + class ServiceContextList; + class ServiceContextList_var; + + // ************************************************************* + // ServiceContextList + // ************************************************************* + + class TAO_Export ServiceContextList : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IOP_ServiceContextList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ServiceContext> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: ServiceContextList (void); // default ctor ServiceContextList (CORBA::ULong max); // uses max size ServiceContextList ( - CORBA::ULong max, - CORBA::ULong length, - ServiceContext *buffer, + CORBA::ULong max, + CORBA::ULong length, + ServiceContext *buffer, CORBA::Boolean release=0 ); ServiceContextList (const ServiceContextList &); // copy ctor - ~ServiceContextList (void); // dtor - + ~ServiceContextList (void); static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef ServiceContextList_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + }; - typedef ServiceContextList *ServiceContextList_ptr; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_SERVICECONTEXTLIST___VAR_CH_) +#define _IOP_SERVICECONTEXTLIST___VAR_CH_ // ************************************************************* // class IOP::ServiceContextList_var @@ -523,17 +1257,19 @@ TAO_NAMESPACE IOP ServiceContextList_var (ServiceContextList *); ServiceContextList_var (const ServiceContextList_var &); // copy constructor ~ServiceContextList_var (void); // destructor - + ServiceContextList_var &operator= (ServiceContextList *); ServiceContextList_var &operator= (const ServiceContextList_var &); ServiceContextList *operator-> (void); const ServiceContextList *operator-> (void) const; - + operator const ServiceContextList &() const; operator ServiceContextList &(); operator ServiceContextList &() const; + operator ServiceContextList *&(); // variable-size base types only + ServiceContext &operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const ServiceContextList &in (void) const; ServiceContextList &inout (void); ServiceContextList *&out (void); @@ -544,6 +1280,13 @@ TAO_NAMESPACE IOP ServiceContextList *ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_IOP_SERVICECONTEXTLIST___OUT_CH_) +#define _IOP_SERVICECONTEXTLIST___OUT_CH_ + class TAO_Export ServiceContextList_out { public: @@ -556,13 +1299,16 @@ TAO_NAMESPACE IOP ServiceContextList *&ptr (void); ServiceContextList *operator-> (void); ServiceContext &operator[] (CORBA::ULong index); - + private: ServiceContextList *&ptr_; // assignment from T_var not allowed void operator= (const ServiceContextList_var &); }; + +#endif /* end #if !defined */ + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceContextList; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TransactionService; @@ -597,63 +1343,47 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong FT_REQUEST; + } TAO_NAMESPACE_CLOSE // module IOP -TAO_Export void operator<<= (CORBA::Any &, - const IOP::TaggedProfile &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - IOP::TaggedProfile*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - IOP::TaggedProfile *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const IOP::TaggedProfile *&); -TAO_Export void operator<<= (CORBA::Any &, - const IOP::IOR &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - IOP::IOR*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - IOP::IOR *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const IOP::IOR *&); -TAO_Export void operator<<= (CORBA::Any &, - const IOP::TaggedComponent &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - IOP::TaggedComponent*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - IOP::TaggedComponent *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const IOP::TaggedComponent *&); -TAO_Export void operator<<= (CORBA::Any &, - const IOP::MultipleComponentProfile &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - IOP::MultipleComponentProfile*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - IOP::MultipleComponentProfile *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const IOP::MultipleComponentProfile *&); -TAO_Export void operator<<= (CORBA::Any &, - const IOP::ServiceContext &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - IOP::ServiceContext*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - IOP::ServiceContext *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const IOP::ServiceContext *&); -TAO_Export void operator<<= (CORBA::Any &, - const IOP::ServiceContextList &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - IOP::ServiceContextList*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - IOP::ServiceContextList *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const IOP::ServiceContextList *&); - +TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfile *&); +TAO_Export void operator<<= (CORBA::Any &, const IOP::IOR &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::IOR *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::IOR *&); +TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponent *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponent *&); +TAO_Export void operator<<= (CORBA::Any &, const IOP::MultipleComponentProfile &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::MultipleComponentProfile *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::MultipleComponentProfile *&); +TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentList &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentList*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentList *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentList *&); +TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContext *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContext *&); +TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContextList &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&); #ifndef __ACE_INLINE__ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedProfile &); + +#if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_ +#define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_ + TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const IOP::TaggedProfile::_tao_seq_Octet & @@ -663,8 +1393,14 @@ TAO_Export CORBA::Boolean operator>> ( IOP::TaggedProfile::_tao_seq_Octet & ); +#endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_ */ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::IOR &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::IOR &); + +#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_H_ +#define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_H_ + TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const IOP::IOR::_tao_seq_TaggedProfile & @@ -674,8 +1410,14 @@ TAO_Export CORBA::Boolean operator>> ( IOP::IOR::_tao_seq_TaggedProfile & ); +#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_H_ */ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedComponent &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedComponent &); + +#if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_ +#define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_ + TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const IOP::TaggedComponent::_tao_seq_Octet & @@ -685,6 +1427,12 @@ TAO_Export CORBA::Boolean operator>> ( IOP::TaggedComponent::_tao_seq_Octet & ); +#endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_ */ + + +#if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ +#define _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ + TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const IOP::MultipleComponentProfile & @@ -694,8 +1442,29 @@ TAO_Export CORBA::Boolean operator>> ( IOP::MultipleComponentProfile & ); +#endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ */ + + +#if !defined _TAO_CDR_OP_IOP_TaggedComponentList_H_ +#define _TAO_CDR_OP_IOP_TaggedComponentList_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const IOP::TaggedComponentList & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + IOP::TaggedComponentList & + ); + +#endif /* _TAO_CDR_OP_IOP_TaggedComponentList_H_ */ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::ServiceContext &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::ServiceContext &); + +#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_ +#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_ + TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const IOP::ServiceContext::_tao_seq_Octet & @@ -705,6 +1474,12 @@ TAO_Export CORBA::Boolean operator>> ( IOP::ServiceContext::_tao_seq_Octet & ); +#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_ */ + + +#if !defined _TAO_CDR_OP_IOP_ServiceContextList_H_ +#define _TAO_CDR_OP_IOP_ServiceContextList_H_ + TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const IOP::ServiceContextList & @@ -714,12 +1489,14 @@ TAO_Export CORBA::Boolean operator>> ( IOP::ServiceContextList & ); +#endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */ + #endif /* __ACE_INLINE__ */ #if defined (__ACE_INLINE__) -#include "tao/IOPC.i" +#include "IOPC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -727,4 +1504,4 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _MSC_VER */ #include "ace/post.h" -#endif /* TAO_IOPC_H */ +#endif /* ifndef */ diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i index 970fb04cb64..138236420af 100644 --- a/TAO/tao/IOPC.i +++ b/TAO/tao/IOPC.i @@ -1,5 +1,24 @@ +// -*- 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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + // ************************************************************* // Inline operations for class IOP::TaggedProfile_var // ************************************************************* @@ -10,16 +29,15 @@ IOP::TaggedProfile_var::TaggedProfile_var (void) // default constructor {} ACE_INLINE -IOP::TaggedProfile_var::TaggedProfile_var (IOP::TaggedProfile *p) +IOP::TaggedProfile_var::TaggedProfile_var (TaggedProfile *p) : ptr_ (p) {} ACE_INLINE -IOP::TaggedProfile_var::TaggedProfile_var (const IOP::TaggedProfile_var &p) // copy constructor +IOP::TaggedProfile_var::TaggedProfile_var (const ::IOP::TaggedProfile_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - IOP::TaggedProfile(*p.ptr_)); + ACE_NEW (this->ptr_, ::IOP::TaggedProfile (*p.ptr_)); else this->ptr_ = 0; } @@ -31,70 +49,75 @@ IOP::TaggedProfile_var::~TaggedProfile_var (void) // destructor } ACE_INLINE IOP::TaggedProfile_var & -IOP::TaggedProfile_var::operator= (IOP::TaggedProfile *p) +IOP::TaggedProfile_var::operator= (TaggedProfile *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE IOP::TaggedProfile_var & -IOP::TaggedProfile_var::operator= (const IOP::TaggedProfile_var &p) +ACE_INLINE ::IOP::TaggedProfile_var & +IOP::TaggedProfile_var::operator= (const ::IOP::TaggedProfile_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - IOP::TaggedProfile (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedProfile (*p.ptr_), *this); } return *this; } -ACE_INLINE const IOP::TaggedProfile * +ACE_INLINE const ::IOP::TaggedProfile * IOP::TaggedProfile_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE IOP::TaggedProfile * +ACE_INLINE ::IOP::TaggedProfile * IOP::TaggedProfile_var::operator-> (void) { return this->ptr_; } ACE_INLINE -IOP::TaggedProfile_var::operator const IOP::TaggedProfile &() const // cast +IOP::TaggedProfile_var::operator const ::IOP::TaggedProfile &() const // cast { return *this->ptr_; } ACE_INLINE -IOP::TaggedProfile_var::operator IOP::TaggedProfile &() // cast +IOP::TaggedProfile_var::operator ::IOP::TaggedProfile &() // cast { return *this->ptr_; } ACE_INLINE -IOP::TaggedProfile_var::operator IOP::TaggedProfile &() const// cast +IOP::TaggedProfile_var::operator ::IOP::TaggedProfile &() const // cast { return *this->ptr_; } -ACE_INLINE const IOP::TaggedProfile & +// variable-size types only +ACE_INLINE +IOP::TaggedProfile_var::operator ::IOP::TaggedProfile *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE const ::IOP::TaggedProfile & IOP::TaggedProfile_var::in (void) const { return *this->ptr_; } -ACE_INLINE IOP::TaggedProfile & +ACE_INLINE ::IOP::TaggedProfile & IOP::TaggedProfile_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE IOP::TaggedProfile *& +// mapping for variable size +ACE_INLINE ::IOP::TaggedProfile *& IOP::TaggedProfile_var::out (void) { delete this->ptr_; @@ -102,15 +125,15 @@ IOP::TaggedProfile_var::out (void) return this->ptr_; } -ACE_INLINE IOP::TaggedProfile * +ACE_INLINE ::IOP::TaggedProfile * IOP::TaggedProfile_var::_retn (void) { - IOP::TaggedProfile *tmp = this->ptr_; + ::IOP::TaggedProfile *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE IOP::TaggedProfile * +ACE_INLINE ::IOP::TaggedProfile * IOP::TaggedProfile_var::ptr (void) const { return this->ptr_; @@ -121,14 +144,14 @@ IOP::TaggedProfile_var::ptr (void) const // ************************************************************* ACE_INLINE -IOP::TaggedProfile_out::TaggedProfile_out (IOP::TaggedProfile *&p) +IOP::TaggedProfile_out::TaggedProfile_out (::IOP::TaggedProfile *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -IOP::TaggedProfile_out::TaggedProfile_out (IOP::TaggedProfile_var &p) // constructor from _var +IOP::TaggedProfile_out::TaggedProfile_out (TaggedProfile_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -136,42 +159,249 @@ IOP::TaggedProfile_out::TaggedProfile_out (IOP::TaggedProfile_var &p) // constru } ACE_INLINE -IOP::TaggedProfile_out::TaggedProfile_out (const IOP::TaggedProfile_out &p) // copy constructor - : ptr_ (ACE_const_cast (IOP::TaggedProfile_out&,p).ptr_) +IOP::TaggedProfile_out::TaggedProfile_out (const ::IOP::TaggedProfile_out &p) // copy constructor + : ptr_ (ACE_const_cast (TaggedProfile_out&, p).ptr_) {} ACE_INLINE IOP::TaggedProfile_out & -IOP::TaggedProfile_out::operator= (const IOP::TaggedProfile_out &p) +IOP::TaggedProfile_out::operator= (const ::IOP::TaggedProfile_out &p) { - this->ptr_ = ACE_const_cast (IOP::TaggedProfile_out&,p).ptr_; + this->ptr_ = ACE_const_cast (TaggedProfile_out&, p).ptr_; return *this; } ACE_INLINE IOP::TaggedProfile_out & -IOP::TaggedProfile_out::operator= (IOP::TaggedProfile *p) +IOP::TaggedProfile_out::operator= (TaggedProfile *p) { this->ptr_ = p; return *this; } -ACE_INLINE -IOP::TaggedProfile_out::operator IOP::TaggedProfile *&() // cast +ACE_INLINE +IOP::TaggedProfile_out::operator ::IOP::TaggedProfile *&() // cast { return this->ptr_; } -ACE_INLINE IOP::TaggedProfile *& +ACE_INLINE ::IOP::TaggedProfile *& IOP::TaggedProfile_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE IOP::TaggedProfile * +ACE_INLINE ::IOP::TaggedProfile * IOP::TaggedProfile_out::operator-> (void) { return this->ptr_; } + +#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CI_) +#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CI_ + +// ************************************************************* +// Inline operations for class IOP::TaggedProfile::_tao_seq_Octet_var +// ************************************************************* + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p) + : ptr_ (p) +{} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::TaggedProfile::_tao_seq_Octet_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::IOP::TaggedProfile::_tao_seq_Octet (*p.ptr_)); + else + this->ptr_ = 0; +} + +// fixed-size base types only +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::TaggedProfile::_tao_seq_Octet &p) +{ + ACE_NEW (this->ptr_, ::IOP::TaggedProfile::_tao_seq_Octet (p)); +} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE IOP::TaggedProfile::_tao_seq_Octet_var & +IOP::TaggedProfile::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE IOP::TaggedProfile::_tao_seq_Octet_var & +IOP::TaggedProfile::_tao_seq_Octet_var::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet_var &p) // deep copy +{ + if (this != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedProfile::_tao_seq_Octet (*p.ptr_), *this); + } + return *this; +} + +// fixed-size types only +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet_var & +IOP::TaggedProfile::_tao_seq_Octet_var::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedProfile::_tao_seq_Octet (p), *this); + } + return *this; +} + +ACE_INLINE const ::IOP::TaggedProfile::_tao_seq_Octet * +IOP::TaggedProfile::_tao_seq_Octet_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet * +IOP::TaggedProfile::_tao_seq_Octet_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_var::operator const ::IOP::TaggedProfile::_tao_seq_Octet &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_var::operator ::IOP::TaggedProfile::_tao_seq_Octet &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_var::operator ::IOP::TaggedProfile::_tao_seq_Octet &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE CORBA::Octet & +IOP::TaggedProfile::_tao_seq_Octet_var::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +ACE_INLINE const ::IOP::TaggedProfile::_tao_seq_Octet & +IOP::TaggedProfile::_tao_seq_Octet_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet & +IOP::TaggedProfile::_tao_seq_Octet_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet *& +IOP::TaggedProfile::_tao_seq_Octet_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet * +IOP::TaggedProfile::_tao_seq_Octet_var::_retn (void) +{ + ::IOP::TaggedProfile::_tao_seq_Octet *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet * +IOP::TaggedProfile::_tao_seq_Octet_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class IOP::TaggedProfile::_tao_seq_Octet_out +// ************************************************************* + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::IOP::TaggedProfile::_tao_seq_Octet_out &p) // copy constructor + : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_) +{} + +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet_out & +IOP::TaggedProfile::_tao_seq_Octet_out::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet_out &p) +{ + this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_; + return *this; +} + +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet_out & +IOP::TaggedProfile::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +IOP::TaggedProfile::_tao_seq_Octet_out::operator ::IOP::TaggedProfile::_tao_seq_Octet *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet *& +IOP::TaggedProfile::_tao_seq_Octet_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet * +IOP::TaggedProfile::_tao_seq_Octet_out::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE CORBA::Octet & +IOP::TaggedProfile::_tao_seq_Octet_out::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + + +#endif /* end #if !defined */ + // ************************************************************* // Inline operations for class IOP::IOR_var // ************************************************************* @@ -182,16 +412,15 @@ IOP::IOR_var::IOR_var (void) // default constructor {} ACE_INLINE -IOP::IOR_var::IOR_var (IOP::IOR *p) +IOP::IOR_var::IOR_var (IOR *p) : ptr_ (p) {} ACE_INLINE -IOP::IOR_var::IOR_var (const IOP::IOR_var &p) // copy constructor +IOP::IOR_var::IOR_var (const ::IOP::IOR_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - IOP::IOR(*p.ptr_)); + ACE_NEW (this->ptr_, ::IOP::IOR (*p.ptr_)); else this->ptr_ = 0; } @@ -203,70 +432,75 @@ IOP::IOR_var::~IOR_var (void) // destructor } ACE_INLINE IOP::IOR_var & -IOP::IOR_var::operator= (IOP::IOR *p) +IOP::IOR_var::operator= (IOR *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE IOP::IOR_var & -IOP::IOR_var::operator= (const IOP::IOR_var &p) +ACE_INLINE ::IOP::IOR_var & +IOP::IOR_var::operator= (const ::IOP::IOR_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - IOP::IOR (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::IOP::IOR (*p.ptr_), *this); } return *this; } -ACE_INLINE const IOP::IOR * +ACE_INLINE const ::IOP::IOR * IOP::IOR_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE IOP::IOR * +ACE_INLINE ::IOP::IOR * IOP::IOR_var::operator-> (void) { return this->ptr_; } ACE_INLINE -IOP::IOR_var::operator const IOP::IOR &() const // cast +IOP::IOR_var::operator const ::IOP::IOR &() const // cast { return *this->ptr_; } ACE_INLINE -IOP::IOR_var::operator IOP::IOR &() // cast +IOP::IOR_var::operator ::IOP::IOR &() // cast { return *this->ptr_; } ACE_INLINE -IOP::IOR_var::operator IOP::IOR &() const// cast +IOP::IOR_var::operator ::IOP::IOR &() const // cast { return *this->ptr_; } -ACE_INLINE const IOP::IOR & +// variable-size types only +ACE_INLINE +IOP::IOR_var::operator ::IOP::IOR *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE const ::IOP::IOR & IOP::IOR_var::in (void) const { return *this->ptr_; } -ACE_INLINE IOP::IOR & +ACE_INLINE ::IOP::IOR & IOP::IOR_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE IOP::IOR *& +// mapping for variable size +ACE_INLINE ::IOP::IOR *& IOP::IOR_var::out (void) { delete this->ptr_; @@ -274,15 +508,15 @@ IOP::IOR_var::out (void) return this->ptr_; } -ACE_INLINE IOP::IOR * +ACE_INLINE ::IOP::IOR * IOP::IOR_var::_retn (void) { - IOP::IOR *tmp = this->ptr_; + ::IOP::IOR *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE IOP::IOR * +ACE_INLINE ::IOP::IOR * IOP::IOR_var::ptr (void) const { return this->ptr_; @@ -293,14 +527,14 @@ IOP::IOR_var::ptr (void) const // ************************************************************* ACE_INLINE -IOP::IOR_out::IOR_out (IOP::IOR *&p) +IOP::IOR_out::IOR_out (::IOP::IOR *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -IOP::IOR_out::IOR_out (IOP::IOR_var &p) // constructor from _var +IOP::IOR_out::IOR_out (IOR_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -308,42 +542,413 @@ IOP::IOR_out::IOR_out (IOP::IOR_var &p) // constructor from _var } ACE_INLINE -IOP::IOR_out::IOR_out (const IOP::IOR_out &p) // copy constructor - : ptr_ (ACE_const_cast (IOP::IOR_out&,p).ptr_) +IOP::IOR_out::IOR_out (const ::IOP::IOR_out &p) // copy constructor + : ptr_ (ACE_const_cast (IOR_out&, p).ptr_) {} ACE_INLINE IOP::IOR_out & -IOP::IOR_out::operator= (const IOP::IOR_out &p) +IOP::IOR_out::operator= (const ::IOP::IOR_out &p) { - this->ptr_ = ACE_const_cast (IOP::IOR_out&,p).ptr_; + this->ptr_ = ACE_const_cast (IOR_out&, p).ptr_; return *this; } ACE_INLINE IOP::IOR_out & -IOP::IOR_out::operator= (IOP::IOR *p) +IOP::IOR_out::operator= (IOR *p) { this->ptr_ = p; return *this; } -ACE_INLINE -IOP::IOR_out::operator IOP::IOR *&() // cast +ACE_INLINE +IOP::IOR_out::operator ::IOP::IOR *&() // cast { return this->ptr_; } -ACE_INLINE IOP::IOR *& +ACE_INLINE ::IOP::IOR *& IOP::IOR_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE IOP::IOR * +ACE_INLINE ::IOP::IOR * IOP::IOR_out::operator-> (void) { return this->ptr_; } + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_ + + // = Static operations. + ACE_INLINE IOP::TaggedProfile * + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (CORBA::ULong size) + // Allocate storage for the sequence. + { + IOP::TaggedProfile *retval = 0; + ACE_NEW_RETURN (retval, IOP::TaggedProfile[size], 0); + return retval; + } + + ACE_INLINE void IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (IOP::TaggedProfile *buffer) + // Free the sequence. + { + delete [] buffer; + } + + ACE_INLINE + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Default constructor. + { + } + + ACE_INLINE + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (maximum)) + { + } + + ACE_INLINE + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum, + CORBA::ULong length, + IOP::TaggedProfile *data, + CORBA::Boolean release) + : TAO_Unbounded_Base_Sequence (maximum, length, data, release) + { + } + + ACE_INLINE + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs) + // Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) + { + if (rhs.buffer_ != 0) + { + IOP::TaggedProfile *tmp1 = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->maximum_); + IOP::TaggedProfile * const tmp2 = ACE_reinterpret_cast (IOP::TaggedProfile * 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 IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile & + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator= (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs) + // Assignment operator. + { + if (this == &rhs) + return *this; + + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_); + } + } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + IOP::TaggedProfile *tmp1 = ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); + IOP::TaggedProfile * const tmp2 = ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; + } + + // = Accessors. + ACE_INLINE IOP::TaggedProfile & + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IOP::TaggedProfile* tmp = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); + return tmp[i]; + } + + ACE_INLINE const IOP::TaggedProfile & + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) const + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IOP::TaggedProfile * const tmp = ACE_reinterpret_cast (IOP::TaggedProfile* ACE_CAST_CONST, this->buffer_); + return tmp[i]; + } + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ACE_INLINE IOP::TaggedProfile * + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (CORBA::Boolean orphan) + { + IOP::TaggedProfile *result = 0; + if (orphan == 0) + { + // We retain ownership. + if (this->buffer_ == 0) + { + result = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; + } + else + { + result = ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_); + } + } + else // if (orphan == 1) + { + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } + } + return result; + } + + ACE_INLINE const IOP::TaggedProfile * + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (void) const + { + return ACE_reinterpret_cast(const IOP::TaggedProfile * ACE_CAST_CONST, this->buffer_); + } + + ACE_INLINE void + IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::replace (CORBA::ULong max, + CORBA::ULong length, + IOP::TaggedProfile *data, + CORBA::Boolean release) + { + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::TaggedProfile *tmp = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; + } + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_) +#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_ + +// ************************************************************* +// Inline operations for class IOP::IOR::_tao_seq_TaggedProfile_var +// ************************************************************* + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_var::_tao_seq_TaggedProfile_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_var::_tao_seq_TaggedProfile_var (_tao_seq_TaggedProfile *p) + : ptr_ (p) +{} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_var::_tao_seq_TaggedProfile_var (const ::IOP::IOR::_tao_seq_TaggedProfile_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::IOP::IOR::_tao_seq_TaggedProfile (*p.ptr_)); + else + this->ptr_ = 0; +} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_var::~_tao_seq_TaggedProfile_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE IOP::IOR::_tao_seq_TaggedProfile_var & +IOP::IOR::_tao_seq_TaggedProfile_var::operator= (_tao_seq_TaggedProfile *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE IOP::IOR::_tao_seq_TaggedProfile_var & +IOP::IOR::_tao_seq_TaggedProfile_var::operator= (const ::IOP::IOR::_tao_seq_TaggedProfile_var &p) // deep copy +{ + if (this != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IOP::IOR::_tao_seq_TaggedProfile (*p.ptr_), *this); + } + return *this; +} + +ACE_INLINE const ::IOP::IOR::_tao_seq_TaggedProfile * +IOP::IOR::_tao_seq_TaggedProfile_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile * +IOP::IOR::_tao_seq_TaggedProfile_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_var::operator const ::IOP::IOR::_tao_seq_TaggedProfile &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_var::operator ::IOP::IOR::_tao_seq_TaggedProfile &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_var::operator ::IOP::IOR::_tao_seq_TaggedProfile &() const // cast +{ + return *this->ptr_; +} + +// variable-size types only +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_var::operator ::IOP::IOR::_tao_seq_TaggedProfile *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE IOP::TaggedProfile & +IOP::IOR::_tao_seq_TaggedProfile_var::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +ACE_INLINE const ::IOP::IOR::_tao_seq_TaggedProfile & +IOP::IOR::_tao_seq_TaggedProfile_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile & +IOP::IOR::_tao_seq_TaggedProfile_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile *& +IOP::IOR::_tao_seq_TaggedProfile_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile * +IOP::IOR::_tao_seq_TaggedProfile_var::_retn (void) +{ + ::IOP::IOR::_tao_seq_TaggedProfile *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile * +IOP::IOR::_tao_seq_TaggedProfile_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class IOP::IOR::_tao_seq_TaggedProfile_out +// ************************************************************* + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_out::_tao_seq_TaggedProfile_out (_tao_seq_TaggedProfile *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_out::_tao_seq_TaggedProfile_out (_tao_seq_TaggedProfile_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_out::_tao_seq_TaggedProfile_out (const ::IOP::IOR::_tao_seq_TaggedProfile_out &p) // copy constructor + : ptr_ (ACE_const_cast (_tao_seq_TaggedProfile_out&, p).ptr_) +{} + +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile_out & +IOP::IOR::_tao_seq_TaggedProfile_out::operator= (const ::IOP::IOR::_tao_seq_TaggedProfile_out &p) +{ + this->ptr_ = ACE_const_cast (_tao_seq_TaggedProfile_out&, p).ptr_; + return *this; +} + +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile_out & +IOP::IOR::_tao_seq_TaggedProfile_out::operator= (_tao_seq_TaggedProfile *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +IOP::IOR::_tao_seq_TaggedProfile_out::operator ::IOP::IOR::_tao_seq_TaggedProfile *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile *& +IOP::IOR::_tao_seq_TaggedProfile_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile * +IOP::IOR::_tao_seq_TaggedProfile_out::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE IOP::TaggedProfile & +IOP::IOR::_tao_seq_TaggedProfile_out::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + + +#endif /* end #if !defined */ + // ************************************************************* // Inline operations for class IOP::TaggedComponent_var // ************************************************************* @@ -354,16 +959,15 @@ IOP::TaggedComponent_var::TaggedComponent_var (void) // default constructor {} ACE_INLINE -IOP::TaggedComponent_var::TaggedComponent_var (IOP::TaggedComponent *p) +IOP::TaggedComponent_var::TaggedComponent_var (TaggedComponent *p) : ptr_ (p) {} ACE_INLINE -IOP::TaggedComponent_var::TaggedComponent_var (const IOP::TaggedComponent_var &p) // copy constructor +IOP::TaggedComponent_var::TaggedComponent_var (const ::IOP::TaggedComponent_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - IOP::TaggedComponent(*p.ptr_)); + ACE_NEW (this->ptr_, ::IOP::TaggedComponent (*p.ptr_)); else this->ptr_ = 0; } @@ -375,70 +979,75 @@ IOP::TaggedComponent_var::~TaggedComponent_var (void) // destructor } ACE_INLINE IOP::TaggedComponent_var & -IOP::TaggedComponent_var::operator= (IOP::TaggedComponent *p) +IOP::TaggedComponent_var::operator= (TaggedComponent *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE IOP::TaggedComponent_var & -IOP::TaggedComponent_var::operator= (const IOP::TaggedComponent_var &p) +ACE_INLINE ::IOP::TaggedComponent_var & +IOP::TaggedComponent_var::operator= (const ::IOP::TaggedComponent_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - IOP::TaggedComponent (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedComponent (*p.ptr_), *this); } return *this; } -ACE_INLINE const IOP::TaggedComponent * +ACE_INLINE const ::IOP::TaggedComponent * IOP::TaggedComponent_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE IOP::TaggedComponent * +ACE_INLINE ::IOP::TaggedComponent * IOP::TaggedComponent_var::operator-> (void) { return this->ptr_; } ACE_INLINE -IOP::TaggedComponent_var::operator const IOP::TaggedComponent &() const // cast +IOP::TaggedComponent_var::operator const ::IOP::TaggedComponent &() const // cast { return *this->ptr_; } ACE_INLINE -IOP::TaggedComponent_var::operator IOP::TaggedComponent &() // cast +IOP::TaggedComponent_var::operator ::IOP::TaggedComponent &() // cast { return *this->ptr_; } ACE_INLINE -IOP::TaggedComponent_var::operator IOP::TaggedComponent &() const// cast +IOP::TaggedComponent_var::operator ::IOP::TaggedComponent &() const // cast { return *this->ptr_; } -ACE_INLINE const IOP::TaggedComponent & +// variable-size types only +ACE_INLINE +IOP::TaggedComponent_var::operator ::IOP::TaggedComponent *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE const ::IOP::TaggedComponent & IOP::TaggedComponent_var::in (void) const { return *this->ptr_; } -ACE_INLINE IOP::TaggedComponent & +ACE_INLINE ::IOP::TaggedComponent & IOP::TaggedComponent_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE IOP::TaggedComponent *& +// mapping for variable size +ACE_INLINE ::IOP::TaggedComponent *& IOP::TaggedComponent_var::out (void) { delete this->ptr_; @@ -446,15 +1055,15 @@ IOP::TaggedComponent_var::out (void) return this->ptr_; } -ACE_INLINE IOP::TaggedComponent * +ACE_INLINE ::IOP::TaggedComponent * IOP::TaggedComponent_var::_retn (void) { - IOP::TaggedComponent *tmp = this->ptr_; + ::IOP::TaggedComponent *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE IOP::TaggedComponent * +ACE_INLINE ::IOP::TaggedComponent * IOP::TaggedComponent_var::ptr (void) const { return this->ptr_; @@ -465,14 +1074,14 @@ IOP::TaggedComponent_var::ptr (void) const // ************************************************************* ACE_INLINE -IOP::TaggedComponent_out::TaggedComponent_out (IOP::TaggedComponent *&p) +IOP::TaggedComponent_out::TaggedComponent_out (::IOP::TaggedComponent *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -IOP::TaggedComponent_out::TaggedComponent_out (IOP::TaggedComponent_var &p) // constructor from _var +IOP::TaggedComponent_out::TaggedComponent_out (TaggedComponent_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -480,42 +1089,429 @@ IOP::TaggedComponent_out::TaggedComponent_out (IOP::TaggedComponent_var &p) // c } ACE_INLINE -IOP::TaggedComponent_out::TaggedComponent_out (const IOP::TaggedComponent_out &p) // copy constructor - : ptr_ (ACE_const_cast (IOP::TaggedComponent_out&,p).ptr_) +IOP::TaggedComponent_out::TaggedComponent_out (const ::IOP::TaggedComponent_out &p) // copy constructor + : ptr_ (ACE_const_cast (TaggedComponent_out&, p).ptr_) {} ACE_INLINE IOP::TaggedComponent_out & -IOP::TaggedComponent_out::operator= (const IOP::TaggedComponent_out &p) +IOP::TaggedComponent_out::operator= (const ::IOP::TaggedComponent_out &p) { - this->ptr_ = ACE_const_cast (IOP::TaggedComponent_out&,p).ptr_; + this->ptr_ = ACE_const_cast (TaggedComponent_out&, p).ptr_; return *this; } ACE_INLINE IOP::TaggedComponent_out & -IOP::TaggedComponent_out::operator= (IOP::TaggedComponent *p) +IOP::TaggedComponent_out::operator= (TaggedComponent *p) { this->ptr_ = p; return *this; } -ACE_INLINE -IOP::TaggedComponent_out::operator IOP::TaggedComponent *&() // cast +ACE_INLINE +IOP::TaggedComponent_out::operator ::IOP::TaggedComponent *&() // cast { return this->ptr_; } -ACE_INLINE IOP::TaggedComponent *& +ACE_INLINE ::IOP::TaggedComponent *& IOP::TaggedComponent_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE IOP::TaggedComponent * +ACE_INLINE ::IOP::TaggedComponent * IOP::TaggedComponent_out::operator-> (void) { return this->ptr_; } + +#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CI_) +#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CI_ + +// ************************************************************* +// Inline operations for class IOP::TaggedComponent::_tao_seq_Octet_var +// ************************************************************* + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p) + : ptr_ (p) +{} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::TaggedComponent::_tao_seq_Octet_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::IOP::TaggedComponent::_tao_seq_Octet (*p.ptr_)); + else + this->ptr_ = 0; +} + +// fixed-size base types only +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::TaggedComponent::_tao_seq_Octet &p) +{ + ACE_NEW (this->ptr_, ::IOP::TaggedComponent::_tao_seq_Octet (p)); +} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE IOP::TaggedComponent::_tao_seq_Octet_var & +IOP::TaggedComponent::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE IOP::TaggedComponent::_tao_seq_Octet_var & +IOP::TaggedComponent::_tao_seq_Octet_var::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet_var &p) // deep copy +{ + if (this != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedComponent::_tao_seq_Octet (*p.ptr_), *this); + } + return *this; +} + +// fixed-size types only +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet_var & +IOP::TaggedComponent::_tao_seq_Octet_var::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedComponent::_tao_seq_Octet (p), *this); + } + return *this; +} + +ACE_INLINE const ::IOP::TaggedComponent::_tao_seq_Octet * +IOP::TaggedComponent::_tao_seq_Octet_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet * +IOP::TaggedComponent::_tao_seq_Octet_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_var::operator const ::IOP::TaggedComponent::_tao_seq_Octet &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_var::operator ::IOP::TaggedComponent::_tao_seq_Octet &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_var::operator ::IOP::TaggedComponent::_tao_seq_Octet &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE CORBA::Octet & +IOP::TaggedComponent::_tao_seq_Octet_var::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +ACE_INLINE const ::IOP::TaggedComponent::_tao_seq_Octet & +IOP::TaggedComponent::_tao_seq_Octet_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet & +IOP::TaggedComponent::_tao_seq_Octet_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet *& +IOP::TaggedComponent::_tao_seq_Octet_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet * +IOP::TaggedComponent::_tao_seq_Octet_var::_retn (void) +{ + ::IOP::TaggedComponent::_tao_seq_Octet *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet * +IOP::TaggedComponent::_tao_seq_Octet_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class IOP::TaggedComponent::_tao_seq_Octet_out +// ************************************************************* + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::IOP::TaggedComponent::_tao_seq_Octet_out &p) // copy constructor + : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_) +{} + +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet_out & +IOP::TaggedComponent::_tao_seq_Octet_out::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet_out &p) +{ + this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_; + return *this; +} + +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet_out & +IOP::TaggedComponent::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +IOP::TaggedComponent::_tao_seq_Octet_out::operator ::IOP::TaggedComponent::_tao_seq_Octet *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet *& +IOP::TaggedComponent::_tao_seq_Octet_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet * +IOP::TaggedComponent::_tao_seq_Octet_out::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE CORBA::Octet & +IOP::TaggedComponent::_tao_seq_Octet_out::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + + +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CI_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CI_ + + // = Static operations. + ACE_INLINE IOP::TaggedComponent * + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (CORBA::ULong size) + // Allocate storage for the sequence. + { + IOP::TaggedComponent *retval = 0; + ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); + return retval; + } + + ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (IOP::TaggedComponent *buffer) + // Free the sequence. + { + delete [] buffer; + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Default constructor. + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (maximum)) + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release) + : TAO_Unbounded_Base_Sequence (maximum, length, data, release) + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs) + // Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) + { + if (rhs.buffer_ != 0) + { + IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->maximum_); + IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * 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 IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile & + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator= (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs) + // Assignment operator. + { + if (this == &rhs) + return *this; + + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_); + } + } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; + } + + // = Accessors. + ACE_INLINE IOP::TaggedComponent & + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + return tmp[i]; + } + + ACE_INLINE const IOP::TaggedComponent & + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) const + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); + return tmp[i]; + } + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ACE_INLINE IOP::TaggedComponent * + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (CORBA::Boolean orphan) + { + IOP::TaggedComponent *result = 0; + if (orphan == 0) + { + // We retain ownership. + if (this->buffer_ == 0) + { + result = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; + } + else + { + result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); + } + } + else // if (orphan == 1) + { + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } + } + return result; + } + + ACE_INLINE const IOP::TaggedComponent * + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (void) const + { + return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); + } + + ACE_INLINE void + IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::replace (CORBA::ULong max, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release) + { + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; + } + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CI_) +#define _IOP_MULTIPLECOMPONENTPROFILE_CI_ + // ************************************************************* // Inline operations for class IOP::MultipleComponentProfile_var // ************************************************************* @@ -526,16 +1522,15 @@ IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (void) // defaul {} ACE_INLINE -IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (IOP::MultipleComponentProfile *p) +IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (MultipleComponentProfile *p) : ptr_ (p) {} ACE_INLINE -IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (const IOP::MultipleComponentProfile_var &p) // copy constructor +IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (const ::IOP::MultipleComponentProfile_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - IOP::MultipleComponentProfile(*p.ptr_)); + ACE_NEW (this->ptr_, ::IOP::MultipleComponentProfile (*p.ptr_)); else this->ptr_ = 0; } @@ -547,7 +1542,7 @@ IOP::MultipleComponentProfile_var::~MultipleComponentProfile_var (void) // destr } ACE_INLINE IOP::MultipleComponentProfile_var & -IOP::MultipleComponentProfile_var::operator= (IOP::MultipleComponentProfile *p) +IOP::MultipleComponentProfile_var::operator= (MultipleComponentProfile *p) { delete this->ptr_; this->ptr_ = p; @@ -555,68 +1550,73 @@ IOP::MultipleComponentProfile_var::operator= (IOP::MultipleComponentProfile *p) } ACE_INLINE IOP::MultipleComponentProfile_var & -IOP::MultipleComponentProfile_var::operator= (const IOP::MultipleComponentProfile_var &p) // deep copy +IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProfile_var &p) // deep copy { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - IOP::MultipleComponentProfile (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::IOP::MultipleComponentProfile (*p.ptr_), *this); } return *this; } -ACE_INLINE const IOP::MultipleComponentProfile * +ACE_INLINE const ::IOP::MultipleComponentProfile * IOP::MultipleComponentProfile_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE IOP::MultipleComponentProfile * +ACE_INLINE ::IOP::MultipleComponentProfile * IOP::MultipleComponentProfile_var::operator-> (void) { return this->ptr_; } -ACE_INLINE -IOP::MultipleComponentProfile_var::operator const IOP::MultipleComponentProfile &() const // cast +ACE_INLINE +IOP::MultipleComponentProfile_var::operator const ::IOP::MultipleComponentProfile &() const // cast { return *this->ptr_; } -ACE_INLINE -IOP::MultipleComponentProfile_var::operator IOP::MultipleComponentProfile &() // cast +ACE_INLINE +IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile &() // cast { return *this->ptr_; } -ACE_INLINE -IOP::MultipleComponentProfile_var::operator IOP::MultipleComponentProfile &() const// cast +ACE_INLINE +IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile &() const // cast { return *this->ptr_; } +// variable-size types only +ACE_INLINE +IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile *&() // cast +{ + return this->ptr_; +} + ACE_INLINE IOP::TaggedComponent & IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } -ACE_INLINE const IOP::MultipleComponentProfile & +ACE_INLINE const ::IOP::MultipleComponentProfile & IOP::MultipleComponentProfile_var::in (void) const { return *this->ptr_; } -ACE_INLINE IOP::MultipleComponentProfile & +ACE_INLINE ::IOP::MultipleComponentProfile & IOP::MultipleComponentProfile_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE IOP::MultipleComponentProfile *& +// mapping for variable size +ACE_INLINE ::IOP::MultipleComponentProfile *& IOP::MultipleComponentProfile_var::out (void) { delete this->ptr_; @@ -624,15 +1624,15 @@ IOP::MultipleComponentProfile_var::out (void) return this->ptr_; } -ACE_INLINE IOP::MultipleComponentProfile * +ACE_INLINE ::IOP::MultipleComponentProfile * IOP::MultipleComponentProfile_var::_retn (void) { - IOP::MultipleComponentProfile *tmp = this->ptr_; + ::IOP::MultipleComponentProfile *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE IOP::MultipleComponentProfile * +ACE_INLINE ::IOP::MultipleComponentProfile * IOP::MultipleComponentProfile_var::ptr (void) const { return this->ptr_; @@ -643,14 +1643,14 @@ IOP::MultipleComponentProfile_var::ptr (void) const // ************************************************************* ACE_INLINE -IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (IOP::MultipleComponentProfile *&p) +IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (MultipleComponentProfile *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (IOP::MultipleComponentProfile_var &p) // constructor from _var +IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (MultipleComponentProfile_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -658,37 +1658,37 @@ IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (IOP::MultipleCo } ACE_INLINE -IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (const IOP::MultipleComponentProfile_out &p) // copy constructor - : ptr_ (ACE_const_cast (IOP::MultipleComponentProfile_out&,p).ptr_) +IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (const ::IOP::MultipleComponentProfile_out &p) // copy constructor + : ptr_ (ACE_const_cast (MultipleComponentProfile_out&, p).ptr_) {} -ACE_INLINE IOP::MultipleComponentProfile_out & -IOP::MultipleComponentProfile_out::operator= (const IOP::MultipleComponentProfile_out &p) +ACE_INLINE ::IOP::MultipleComponentProfile_out & +IOP::MultipleComponentProfile_out::operator= (const ::IOP::MultipleComponentProfile_out &p) { - this->ptr_ = ACE_const_cast (IOP::MultipleComponentProfile_out&,p).ptr_; + this->ptr_ = ACE_const_cast (MultipleComponentProfile_out&, p).ptr_; return *this; } -ACE_INLINE IOP::MultipleComponentProfile_out & -IOP::MultipleComponentProfile_out::operator= (IOP::MultipleComponentProfile *p) +ACE_INLINE ::IOP::MultipleComponentProfile_out & +IOP::MultipleComponentProfile_out::operator= (MultipleComponentProfile *p) { this->ptr_ = p; return *this; } -ACE_INLINE -IOP::MultipleComponentProfile_out::operator IOP::MultipleComponentProfile *&() // cast +ACE_INLINE +IOP::MultipleComponentProfile_out::operator ::IOP::MultipleComponentProfile *&() // cast { return this->ptr_; } -ACE_INLINE IOP::MultipleComponentProfile *& +ACE_INLINE ::IOP::MultipleComponentProfile *& IOP::MultipleComponentProfile_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE IOP::MultipleComponentProfile * +ACE_INLINE ::IOP::MultipleComponentProfile * IOP::MultipleComponentProfile_out::operator-> (void) { return this->ptr_; @@ -700,6 +1700,380 @@ IOP::MultipleComponentProfile_out::operator[] (CORBA::ULong index) return this->ptr_->operator[] (index); } + +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CI_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CI_ + + // = Static operations. + ACE_INLINE IOP::TaggedComponent * + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (CORBA::ULong size) + // Allocate storage for the sequence. + { + IOP::TaggedComponent *retval = 0; + ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); + return retval; + } + + ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (IOP::TaggedComponent *buffer) + // Free the sequence. + { + delete [] buffer; + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Default constructor. + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (maximum)) + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release) + : TAO_Unbounded_Base_Sequence (maximum, length, data, release) + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs) + // Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) + { + if (rhs.buffer_ != 0) + { + IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->maximum_); + IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * 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 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList & + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs) + // Assignment operator. + { + if (this == &rhs) + return *this; + + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_); + } + } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); + IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; + } + + // = Accessors. + ACE_INLINE IOP::TaggedComponent & + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + return tmp[i]; + } + + ACE_INLINE const IOP::TaggedComponent & + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) const + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); + return tmp[i]; + } + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ACE_INLINE IOP::TaggedComponent * + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (CORBA::Boolean orphan) + { + IOP::TaggedComponent *result = 0; + if (orphan == 0) + { + // We retain ownership. + if (this->buffer_ == 0) + { + result = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; + } + else + { + result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); + } + } + else // if (orphan == 1) + { + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } + } + return result; + } + + ACE_INLINE const IOP::TaggedComponent * + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (void) const + { + return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); + } + + ACE_INLINE void + IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::replace (CORBA::ULong max, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release) + { + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; + } + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_TAGGEDCOMPONENTLIST_CI_) +#define _IOP_TAGGEDCOMPONENTLIST_CI_ + +// ************************************************************* +// Inline operations for class IOP::TaggedComponentList_var +// ************************************************************* + +ACE_INLINE +IOP::TaggedComponentList_var::TaggedComponentList_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +IOP::TaggedComponentList_var::TaggedComponentList_var (TaggedComponentList *p) + : ptr_ (p) +{} + +ACE_INLINE +IOP::TaggedComponentList_var::TaggedComponentList_var (const ::IOP::TaggedComponentList_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::IOP::TaggedComponentList (*p.ptr_)); + else + this->ptr_ = 0; +} + +ACE_INLINE +IOP::TaggedComponentList_var::~TaggedComponentList_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE IOP::TaggedComponentList_var & +IOP::TaggedComponentList_var::operator= (TaggedComponentList *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE IOP::TaggedComponentList_var & +IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p) // deep copy +{ + if (this != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedComponentList (*p.ptr_), *this); + } + return *this; +} + +ACE_INLINE const ::IOP::TaggedComponentList * +IOP::TaggedComponentList_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponentList * +IOP::TaggedComponentList_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +IOP::TaggedComponentList_var::operator const ::IOP::TaggedComponentList &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList &() const // cast +{ + return *this->ptr_; +} + +// variable-size types only +ACE_INLINE +IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE IOP::TaggedComponent & +IOP::TaggedComponentList_var::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +ACE_INLINE const ::IOP::TaggedComponentList & +IOP::TaggedComponentList_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponentList & +IOP::TaggedComponentList_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::IOP::TaggedComponentList *& +IOP::TaggedComponentList_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponentList * +IOP::TaggedComponentList_var::_retn (void) +{ + ::IOP::TaggedComponentList *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::IOP::TaggedComponentList * +IOP::TaggedComponentList_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class IOP::TaggedComponentList_out +// ************************************************************* + +ACE_INLINE +IOP::TaggedComponentList_out::TaggedComponentList_out (TaggedComponentList *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +IOP::TaggedComponentList_out::TaggedComponentList_out (TaggedComponentList_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +IOP::TaggedComponentList_out::TaggedComponentList_out (const ::IOP::TaggedComponentList_out &p) // copy constructor + : ptr_ (ACE_const_cast (TaggedComponentList_out&, p).ptr_) +{} + +ACE_INLINE ::IOP::TaggedComponentList_out & +IOP::TaggedComponentList_out::operator= (const ::IOP::TaggedComponentList_out &p) +{ + this->ptr_ = ACE_const_cast (TaggedComponentList_out&, p).ptr_; + return *this; +} + +ACE_INLINE ::IOP::TaggedComponentList_out & +IOP::TaggedComponentList_out::operator= (TaggedComponentList *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +IOP::TaggedComponentList_out::operator ::IOP::TaggedComponentList *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponentList *& +IOP::TaggedComponentList_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::TaggedComponentList * +IOP::TaggedComponentList_out::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE IOP::TaggedComponent & +IOP::TaggedComponentList_out::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + + +#endif /* end #if !defined */ + // ************************************************************* // Inline operations for class IOP::ServiceContext_var // ************************************************************* @@ -710,16 +2084,15 @@ IOP::ServiceContext_var::ServiceContext_var (void) // default constructor {} ACE_INLINE -IOP::ServiceContext_var::ServiceContext_var (IOP::ServiceContext *p) +IOP::ServiceContext_var::ServiceContext_var (ServiceContext *p) : ptr_ (p) {} ACE_INLINE -IOP::ServiceContext_var::ServiceContext_var (const IOP::ServiceContext_var &p) // copy constructor +IOP::ServiceContext_var::ServiceContext_var (const ::IOP::ServiceContext_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - IOP::ServiceContext(*p.ptr_)); + ACE_NEW (this->ptr_, ::IOP::ServiceContext (*p.ptr_)); else this->ptr_ = 0; } @@ -731,70 +2104,75 @@ IOP::ServiceContext_var::~ServiceContext_var (void) // destructor } ACE_INLINE IOP::ServiceContext_var & -IOP::ServiceContext_var::operator= (IOP::ServiceContext *p) +IOP::ServiceContext_var::operator= (ServiceContext *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE IOP::ServiceContext_var & -IOP::ServiceContext_var::operator= (const IOP::ServiceContext_var &p) +ACE_INLINE ::IOP::ServiceContext_var & +IOP::ServiceContext_var::operator= (const ::IOP::ServiceContext_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - IOP::ServiceContext (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::IOP::ServiceContext (*p.ptr_), *this); } return *this; } -ACE_INLINE const IOP::ServiceContext * +ACE_INLINE const ::IOP::ServiceContext * IOP::ServiceContext_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE IOP::ServiceContext * +ACE_INLINE ::IOP::ServiceContext * IOP::ServiceContext_var::operator-> (void) { return this->ptr_; } ACE_INLINE -IOP::ServiceContext_var::operator const IOP::ServiceContext &() const // cast +IOP::ServiceContext_var::operator const ::IOP::ServiceContext &() const // cast { return *this->ptr_; } ACE_INLINE -IOP::ServiceContext_var::operator IOP::ServiceContext &() // cast +IOP::ServiceContext_var::operator ::IOP::ServiceContext &() // cast { return *this->ptr_; } ACE_INLINE -IOP::ServiceContext_var::operator IOP::ServiceContext &() const// cast +IOP::ServiceContext_var::operator ::IOP::ServiceContext &() const // cast { return *this->ptr_; } -ACE_INLINE const IOP::ServiceContext & +// variable-size types only +ACE_INLINE +IOP::ServiceContext_var::operator ::IOP::ServiceContext *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE const ::IOP::ServiceContext & IOP::ServiceContext_var::in (void) const { return *this->ptr_; } -ACE_INLINE IOP::ServiceContext & +ACE_INLINE ::IOP::ServiceContext & IOP::ServiceContext_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE IOP::ServiceContext *& +// mapping for variable size +ACE_INLINE ::IOP::ServiceContext *& IOP::ServiceContext_var::out (void) { delete this->ptr_; @@ -802,15 +2180,15 @@ IOP::ServiceContext_var::out (void) return this->ptr_; } -ACE_INLINE IOP::ServiceContext * +ACE_INLINE ::IOP::ServiceContext * IOP::ServiceContext_var::_retn (void) { - IOP::ServiceContext *tmp = this->ptr_; + ::IOP::ServiceContext *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE IOP::ServiceContext * +ACE_INLINE ::IOP::ServiceContext * IOP::ServiceContext_var::ptr (void) const { return this->ptr_; @@ -821,14 +2199,14 @@ IOP::ServiceContext_var::ptr (void) const // ************************************************************* ACE_INLINE -IOP::ServiceContext_out::ServiceContext_out (IOP::ServiceContext *&p) +IOP::ServiceContext_out::ServiceContext_out (::IOP::ServiceContext *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -IOP::ServiceContext_out::ServiceContext_out (IOP::ServiceContext_var &p) // constructor from _var +IOP::ServiceContext_out::ServiceContext_out (ServiceContext_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -836,42 +2214,429 @@ IOP::ServiceContext_out::ServiceContext_out (IOP::ServiceContext_var &p) // cons } ACE_INLINE -IOP::ServiceContext_out::ServiceContext_out (const IOP::ServiceContext_out &p) // copy constructor - : ptr_ (ACE_const_cast (IOP::ServiceContext_out&,p).ptr_) +IOP::ServiceContext_out::ServiceContext_out (const ::IOP::ServiceContext_out &p) // copy constructor + : ptr_ (ACE_const_cast (ServiceContext_out&, p).ptr_) {} ACE_INLINE IOP::ServiceContext_out & -IOP::ServiceContext_out::operator= (const IOP::ServiceContext_out &p) +IOP::ServiceContext_out::operator= (const ::IOP::ServiceContext_out &p) { - this->ptr_ = ACE_const_cast (IOP::ServiceContext_out&,p).ptr_; + this->ptr_ = ACE_const_cast (ServiceContext_out&, p).ptr_; return *this; } ACE_INLINE IOP::ServiceContext_out & -IOP::ServiceContext_out::operator= (IOP::ServiceContext *p) +IOP::ServiceContext_out::operator= (ServiceContext *p) { this->ptr_ = p; return *this; } -ACE_INLINE -IOP::ServiceContext_out::operator IOP::ServiceContext *&() // cast +ACE_INLINE +IOP::ServiceContext_out::operator ::IOP::ServiceContext *&() // cast { return this->ptr_; } -ACE_INLINE IOP::ServiceContext *& +ACE_INLINE ::IOP::ServiceContext *& IOP::ServiceContext_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE IOP::ServiceContext * +ACE_INLINE ::IOP::ServiceContext * IOP::ServiceContext_out::operator-> (void) { return this->ptr_; } + +#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CI_) +#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CI_ + +// ************************************************************* +// Inline operations for class IOP::ServiceContext::_tao_seq_Octet_var +// ************************************************************* + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p) + : ptr_ (p) +{} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::ServiceContext::_tao_seq_Octet_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::IOP::ServiceContext::_tao_seq_Octet (*p.ptr_)); + else + this->ptr_ = 0; +} + +// fixed-size base types only +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::ServiceContext::_tao_seq_Octet &p) +{ + ACE_NEW (this->ptr_, ::IOP::ServiceContext::_tao_seq_Octet (p)); +} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE IOP::ServiceContext::_tao_seq_Octet_var & +IOP::ServiceContext::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE IOP::ServiceContext::_tao_seq_Octet_var & +IOP::ServiceContext::_tao_seq_Octet_var::operator= (const ::IOP::ServiceContext::_tao_seq_Octet_var &p) // deep copy +{ + if (this != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IOP::ServiceContext::_tao_seq_Octet (*p.ptr_), *this); + } + return *this; +} + +// fixed-size types only +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet_var & +IOP::ServiceContext::_tao_seq_Octet_var::operator= (const ::IOP::ServiceContext::_tao_seq_Octet &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IOP::ServiceContext::_tao_seq_Octet (p), *this); + } + return *this; +} + +ACE_INLINE const ::IOP::ServiceContext::_tao_seq_Octet * +IOP::ServiceContext::_tao_seq_Octet_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet * +IOP::ServiceContext::_tao_seq_Octet_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_var::operator const ::IOP::ServiceContext::_tao_seq_Octet &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_var::operator ::IOP::ServiceContext::_tao_seq_Octet &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_var::operator ::IOP::ServiceContext::_tao_seq_Octet &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE CORBA::Octet & +IOP::ServiceContext::_tao_seq_Octet_var::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +ACE_INLINE const ::IOP::ServiceContext::_tao_seq_Octet & +IOP::ServiceContext::_tao_seq_Octet_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet & +IOP::ServiceContext::_tao_seq_Octet_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet *& +IOP::ServiceContext::_tao_seq_Octet_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet * +IOP::ServiceContext::_tao_seq_Octet_var::_retn (void) +{ + ::IOP::ServiceContext::_tao_seq_Octet *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet * +IOP::ServiceContext::_tao_seq_Octet_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class IOP::ServiceContext::_tao_seq_Octet_out +// ************************************************************* + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::IOP::ServiceContext::_tao_seq_Octet_out &p) // copy constructor + : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_) +{} + +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet_out & +IOP::ServiceContext::_tao_seq_Octet_out::operator= (const ::IOP::ServiceContext::_tao_seq_Octet_out &p) +{ + this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_; + return *this; +} + +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet_out & +IOP::ServiceContext::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +IOP::ServiceContext::_tao_seq_Octet_out::operator ::IOP::ServiceContext::_tao_seq_Octet *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet *& +IOP::ServiceContext::_tao_seq_Octet_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet * +IOP::ServiceContext::_tao_seq_Octet_out::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE CORBA::Octet & +IOP::ServiceContext::_tao_seq_Octet_out::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + + +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CI_) +#define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CI_ + + // = Static operations. + ACE_INLINE IOP::ServiceContext * + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (CORBA::ULong size) + // Allocate storage for the sequence. + { + IOP::ServiceContext *retval = 0; + ACE_NEW_RETURN (retval, IOP::ServiceContext[size], 0); + return retval; + } + + ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (IOP::ServiceContext *buffer) + // Free the sequence. + { + delete [] buffer; + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Default constructor. + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (maximum)) + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum, + CORBA::ULong length, + IOP::ServiceContext *data, + CORBA::Boolean release) + : TAO_Unbounded_Base_Sequence (maximum, length, data, release) + { + } + + ACE_INLINE + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs) + // Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) + { + if (rhs.buffer_ != 0) + { + IOP::ServiceContext *tmp1 = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->maximum_); + IOP::ServiceContext * const tmp2 = ACE_reinterpret_cast (IOP::ServiceContext * 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 IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList & + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator= (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs) + // Assignment operator. + { + if (this == &rhs) + return *this; + + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); + _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_); + } + } + else + this->buffer_ = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + IOP::ServiceContext *tmp1 = ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); + IOP::ServiceContext * const tmp2 = ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; + } + + // = Accessors. + ACE_INLINE IOP::ServiceContext & + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IOP::ServiceContext* tmp = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); + return tmp[i]; + } + + ACE_INLINE const IOP::ServiceContext & + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) const + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IOP::ServiceContext * const tmp = ACE_reinterpret_cast (IOP::ServiceContext* ACE_CAST_CONST, this->buffer_); + return tmp[i]; + } + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ACE_INLINE IOP::ServiceContext * + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (CORBA::Boolean orphan) + { + IOP::ServiceContext *result = 0; + if (orphan == 0) + { + // We retain ownership. + if (this->buffer_ == 0) + { + result = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; + } + else + { + result = ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_); + } + } + else // if (orphan == 1) + { + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } + } + return result; + } + + ACE_INLINE const IOP::ServiceContext * + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (void) const + { + return ACE_reinterpret_cast(const IOP::ServiceContext * ACE_CAST_CONST, this->buffer_); + } + + ACE_INLINE void + IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::replace (CORBA::ULong max, + CORBA::ULong length, + IOP::ServiceContext *data, + CORBA::Boolean release) + { + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IOP::ServiceContext *tmp = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); + _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; + } + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IOP_SERVICECONTEXTLIST_CI_) +#define _IOP_SERVICECONTEXTLIST_CI_ + // ************************************************************* // Inline operations for class IOP::ServiceContextList_var // ************************************************************* @@ -882,16 +2647,15 @@ IOP::ServiceContextList_var::ServiceContextList_var (void) // default constructo {} ACE_INLINE -IOP::ServiceContextList_var::ServiceContextList_var (IOP::ServiceContextList *p) +IOP::ServiceContextList_var::ServiceContextList_var (ServiceContextList *p) : ptr_ (p) {} ACE_INLINE -IOP::ServiceContextList_var::ServiceContextList_var (const IOP::ServiceContextList_var &p) // copy constructor +IOP::ServiceContextList_var::ServiceContextList_var (const ::IOP::ServiceContextList_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - IOP::ServiceContextList(*p.ptr_)); + ACE_NEW (this->ptr_, ::IOP::ServiceContextList (*p.ptr_)); else this->ptr_ = 0; } @@ -903,7 +2667,7 @@ IOP::ServiceContextList_var::~ServiceContextList_var (void) // destructor } ACE_INLINE IOP::ServiceContextList_var & -IOP::ServiceContextList_var::operator= (IOP::ServiceContextList *p) +IOP::ServiceContextList_var::operator= (ServiceContextList *p) { delete this->ptr_; this->ptr_ = p; @@ -911,68 +2675,73 @@ IOP::ServiceContextList_var::operator= (IOP::ServiceContextList *p) } ACE_INLINE IOP::ServiceContextList_var & -IOP::ServiceContextList_var::operator= (const IOP::ServiceContextList_var &p) // deep copy +IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p) // deep copy { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - IOP::ServiceContextList (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::IOP::ServiceContextList (*p.ptr_), *this); } return *this; } -ACE_INLINE const IOP::ServiceContextList * +ACE_INLINE const ::IOP::ServiceContextList * IOP::ServiceContextList_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE IOP::ServiceContextList * +ACE_INLINE ::IOP::ServiceContextList * IOP::ServiceContextList_var::operator-> (void) { return this->ptr_; } -ACE_INLINE -IOP::ServiceContextList_var::operator const IOP::ServiceContextList &() const // cast +ACE_INLINE +IOP::ServiceContextList_var::operator const ::IOP::ServiceContextList &() const // cast { return *this->ptr_; } -ACE_INLINE -IOP::ServiceContextList_var::operator IOP::ServiceContextList &() // cast +ACE_INLINE +IOP::ServiceContextList_var::operator ::IOP::ServiceContextList &() // cast { return *this->ptr_; } -ACE_INLINE -IOP::ServiceContextList_var::operator IOP::ServiceContextList &() const// cast +ACE_INLINE +IOP::ServiceContextList_var::operator ::IOP::ServiceContextList &() const // cast { return *this->ptr_; } +// variable-size types only +ACE_INLINE +IOP::ServiceContextList_var::operator ::IOP::ServiceContextList *&() // cast +{ + return this->ptr_; +} + ACE_INLINE IOP::ServiceContext & IOP::ServiceContextList_var::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } -ACE_INLINE const IOP::ServiceContextList & +ACE_INLINE const ::IOP::ServiceContextList & IOP::ServiceContextList_var::in (void) const { return *this->ptr_; } -ACE_INLINE IOP::ServiceContextList & +ACE_INLINE ::IOP::ServiceContextList & IOP::ServiceContextList_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE IOP::ServiceContextList *& +// mapping for variable size +ACE_INLINE ::IOP::ServiceContextList *& IOP::ServiceContextList_var::out (void) { delete this->ptr_; @@ -980,15 +2749,15 @@ IOP::ServiceContextList_var::out (void) return this->ptr_; } -ACE_INLINE IOP::ServiceContextList * +ACE_INLINE ::IOP::ServiceContextList * IOP::ServiceContextList_var::_retn (void) { - IOP::ServiceContextList *tmp = this->ptr_; + ::IOP::ServiceContextList *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE IOP::ServiceContextList * +ACE_INLINE ::IOP::ServiceContextList * IOP::ServiceContextList_var::ptr (void) const { return this->ptr_; @@ -999,14 +2768,14 @@ IOP::ServiceContextList_var::ptr (void) const // ************************************************************* ACE_INLINE -IOP::ServiceContextList_out::ServiceContextList_out (IOP::ServiceContextList *&p) +IOP::ServiceContextList_out::ServiceContextList_out (ServiceContextList *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -IOP::ServiceContextList_out::ServiceContextList_out (IOP::ServiceContextList_var &p) // constructor from _var +IOP::ServiceContextList_out::ServiceContextList_out (ServiceContextList_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -1014,37 +2783,37 @@ IOP::ServiceContextList_out::ServiceContextList_out (IOP::ServiceContextList_var } ACE_INLINE -IOP::ServiceContextList_out::ServiceContextList_out (const IOP::ServiceContextList_out &p) // copy constructor - : ptr_ (ACE_const_cast (IOP::ServiceContextList_out&,p).ptr_) +IOP::ServiceContextList_out::ServiceContextList_out (const ::IOP::ServiceContextList_out &p) // copy constructor + : ptr_ (ACE_const_cast (ServiceContextList_out&, p).ptr_) {} -ACE_INLINE IOP::ServiceContextList_out & -IOP::ServiceContextList_out::operator= (const IOP::ServiceContextList_out &p) +ACE_INLINE ::IOP::ServiceContextList_out & +IOP::ServiceContextList_out::operator= (const ::IOP::ServiceContextList_out &p) { - this->ptr_ = ACE_const_cast (IOP::ServiceContextList_out&,p).ptr_; + this->ptr_ = ACE_const_cast (ServiceContextList_out&, p).ptr_; return *this; } -ACE_INLINE IOP::ServiceContextList_out & -IOP::ServiceContextList_out::operator= (IOP::ServiceContextList *p) +ACE_INLINE ::IOP::ServiceContextList_out & +IOP::ServiceContextList_out::operator= (ServiceContextList *p) { this->ptr_ = p; return *this; } -ACE_INLINE -IOP::ServiceContextList_out::operator IOP::ServiceContextList *&() // cast +ACE_INLINE +IOP::ServiceContextList_out::operator ::IOP::ServiceContextList *&() // cast { return this->ptr_; } -ACE_INLINE IOP::ServiceContextList *& +ACE_INLINE ::IOP::ServiceContextList *& IOP::ServiceContextList_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE IOP::ServiceContextList * +ACE_INLINE ::IOP::ServiceContextList * IOP::ServiceContextList_out::operator-> (void) { return this->ptr_; @@ -1056,6 +2825,13 @@ IOP::ServiceContextList_out::operator[] (CORBA::ULong index) return this->ptr_->operator[] (index); } + +#endif /* end #if !defined */ + + +#if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_ +#define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_ + CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, const IOP::TaggedProfile::_tao_seq_Octet & @@ -1065,6 +2841,8 @@ CORBA::Boolean TAO_Export operator>> ( IOP::TaggedProfile::_tao_seq_Octet & ); +#endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_ */ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedProfile &_tao_aggregate) { if ( @@ -1074,7 +2852,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedProf return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedProfile &_tao_aggregate) @@ -1086,9 +2864,13 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedProfile &_t return 1; else return 0; - + } + +#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_I_ +#define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_I_ + CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, const IOP::IOR::_tao_seq_TaggedProfile & @@ -1098,6 +2880,8 @@ CORBA::Boolean TAO_Export operator>> ( IOP::IOR::_tao_seq_TaggedProfile & ); +#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_I_ */ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::IOR &_tao_aggregate) { if ( @@ -1107,7 +2891,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::IOR &_tao_ return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::IOR &_tao_aggregate) @@ -1119,9 +2903,13 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::IOR &_tao_aggrega return 1; else return 0; - + } + +#if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_ +#define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_ + CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, const IOP::TaggedComponent::_tao_seq_Octet & @@ -1131,6 +2919,8 @@ CORBA::Boolean TAO_Export operator>> ( IOP::TaggedComponent::_tao_seq_Octet & ); +#endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_ */ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedComponent &_tao_aggregate) { if ( @@ -1140,7 +2930,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedComp return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedComponent &_tao_aggregate) @@ -1152,9 +2942,13 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedComponent & return 1; else return 0; - + } + +#if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_I_ +#define _TAO_CDR_OP_IOP_MultipleComponentProfile_I_ + CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, const IOP::MultipleComponentProfile & @@ -1164,6 +2958,27 @@ CORBA::Boolean TAO_Export operator>> ( IOP::MultipleComponentProfile & ); +#endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_I_ */ + + +#if !defined _TAO_CDR_OP_IOP_TaggedComponentList_I_ +#define _TAO_CDR_OP_IOP_TaggedComponentList_I_ + +CORBA::Boolean TAO_Export operator<< ( + TAO_OutputCDR &, + const IOP::TaggedComponentList & + ); +CORBA::Boolean TAO_Export operator>> ( + TAO_InputCDR &, + IOP::TaggedComponentList & + ); + +#endif /* _TAO_CDR_OP_IOP_TaggedComponentList_I_ */ + + +#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_ +#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_ + CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, const IOP::ServiceContext::_tao_seq_Octet & @@ -1173,6 +2988,8 @@ CORBA::Boolean TAO_Export operator>> ( IOP::ServiceContext::_tao_seq_Octet & ); +#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_ */ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::ServiceContext &_tao_aggregate) { if ( @@ -1182,7 +2999,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::ServiceCon return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::ServiceContext &_tao_aggregate) @@ -1194,9 +3011,13 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::ServiceContext &_ return 1; else return 0; - + } + +#if !defined _TAO_CDR_OP_IOP_ServiceContextList_I_ +#define _TAO_CDR_OP_IOP_ServiceContextList_I_ + CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, const IOP::ServiceContextList & @@ -1205,3 +3026,6 @@ CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, IOP::ServiceContextList & ); + +#endif /* _TAO_CDR_OP_IOP_ServiceContextList_I_ */ + diff --git a/TAO/tao/IOPS.cpp b/TAO/tao/IOPS.cpp index 86c1767fa43..4e9eaeb6833 100644 --- a/TAO/tao/IOPS.cpp +++ b/TAO/tao/IOPS.cpp @@ -1,24 +1,27 @@ +// -*- 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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// IOPS.h -// -// = DESCRIPTION -// Generated from IOP.pidl, that contains the OMG standarized IOP -// module. -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. -// -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/IOPS.h" +#include "IOPS.h" #if !defined (__ACE_INLINE__) -#include "tao/IOPS.i" +#include "IOPS.i" #endif /* !defined INLINE */ + diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h index 6bf00258f85..a7318d979c8 100644 --- a/TAO/tao/IOPS.h +++ b/TAO/tao/IOPS.h @@ -1,26 +1,29 @@ -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// IOPS.h +// -*- C++ -*- // -// = DESCRIPTION -// Generated from IOP.pidl, that contains the OMG standarized IOP -// module. -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. +// $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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef TAO_IOPS_H -#define TAO_IOPS_H -#include "ace/pre.h" +#ifndef _TAO_IDL_IOPS_H_ +#define _TAO_IDL_IOPS_H_ -#include "tao/IOPC.h" +#include "ace/pre.h" +#include "IOPC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -39,10 +42,10 @@ TAO_NAMESPACE POA_IOP } TAO_NAMESPACE_CLOSE -#include "tao/IOPS_T.h" +#include "IOPS_T.h" #if defined (__ACE_INLINE__) -#include "tao/IOPS.i" +#include "IOPS.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -50,4 +53,4 @@ TAO_NAMESPACE_CLOSE #endif /* _MSC_VER */ #include "ace/post.h" -#endif /* TAO_IOPS_H */ +#endif /* ifndef */ diff --git a/TAO/tao/IOPS.i b/TAO/tao/IOPS.i index cfa1da318d3..9d1a42dd508 100644 --- a/TAO/tao/IOPS.i +++ b/TAO/tao/IOPS.i @@ -1 +1,21 @@ +// -*- 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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + diff --git a/TAO/tao/IOPS_T.cpp b/TAO/tao/IOPS_T.cpp index 22a688758e7..e67a27b837d 100644 --- a/TAO/tao/IOPS_T.cpp +++ b/TAO/tao/IOPS_T.cpp @@ -1,30 +1,32 @@ +// -*- 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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// IOPS_T.cpp -// -// = DESCRIPTION -// Generated from IOP.pidl, that contains the OMG standarized IOP -// module. -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. -// -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef TAO_IOPS_T_CPP -#define TAO_IOPS_T_CPP +#ifndef _TAO_IDL_IOPS_T_CPP_ +#define _TAO_IDL_IOPS_T_CPP_ -#include "tao/IOPS_T.h" +#include "IOPS_T.h" #if !defined (__ACE_INLINE__) -#include "tao/IOPS_T.i" +#include "IOPS_T.i" #endif /* !defined INLINE */ -#endif /* TAO_IOPS_T_CPP */ +#endif /* ifndef */ diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h index 2ed0bc8cbef..99d140830b8 100644 --- a/TAO/tao/IOPS_T.h +++ b/TAO/tao/IOPS_T.h @@ -1,26 +1,28 @@ +// -*- 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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ // -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// IOPS_T.cpp -// -// = DESCRIPTION -// Generated from IOP.pidl, that contains the OMG standarized IOP -// module. -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. -// -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef TAO_IOPS_T_H -#define TAO_IOPS_T_H -#include "ace/pre.h" +#ifndef _TAO_IDL_IOPS_T_H_ +#define _TAO_IDL_IOPS_T_H_ +#include "ace/pre.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -30,12 +32,12 @@ #if defined (__ACE_INLINE__) -#include "tao/IOPS_T.i" +#include "IOPS_T.i" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/IOPS_T.cpp" +#include "IOPS_T.cpp" #endif /* defined REQUIRED SOURCE */ @@ -48,4 +50,4 @@ #endif /* _MSC_VER */ #include "ace/post.h" -#endif /* TAO_IOPS_T_H */ +#endif /* ifndef */ diff --git a/TAO/tao/IOPS_T.i b/TAO/tao/IOPS_T.i index cfa1da318d3..9d1a42dd508 100644 --- a/TAO/tao/IOPS_T.i +++ b/TAO/tao/IOPS_T.i @@ -1 +1,21 @@ +// -*- 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-group.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + diff --git a/TAO/tao/Tagged_Components.i b/TAO/tao/Tagged_Components.i index 70ad180f31c..d67dcc6e07b 100644 --- a/TAO/tao/Tagged_Components.i +++ b/TAO/tao/Tagged_Components.i @@ -1,3 +1,5 @@ +// -*- C++ -*- +// // $Id$ ACE_INLINE @@ -47,18 +49,7 @@ TAO_Tagged_Components::unique_tag (IOP::ComponentId tag) const || tag == IOP::TAG_CODE_SETS || tag == IOP::TAG_POLICIES || tag == TAO_TAG_ENDPOINTS - || tag == TAO_TAG_SSL_ENDPOINTS // || tag == IOP::TAG_ALTERNATE_IIOP_ADDRESS - || tag == IOP::TAG_ASSOCIATION_OPTIONS - || tag == IOP::TAG_SEC_NAME - || tag == IOP::TAG_SPKM_1_SEC_MECH - || tag == IOP::TAG_SPKM_2_SEC_MECH - || tag == IOP::TAG_KerberosV5_SEC_MECH - || tag == IOP::TAG_CSI_ECMA_Secret_SEC_MECH - || tag == IOP::TAG_CSI_ECMA_Hybrid_SEC_MECH - || tag == IOP::TAG_SSL_SEC_TRANS - || tag == IOP::TAG_CSI_ECMA_Public_SEC_MECH - || tag == IOP::TAG_GENERIC_SEC_MECH || tag == IOP::TAG_COMPLETE_OBJECT_KEY || tag == IOP::TAG_ENDPOINT_ID_POSITION || tag == IOP::TAG_LOCATION_POLICY @@ -66,8 +57,7 @@ TAO_Tagged_Components::unique_tag (IOP::ComponentId tag) const || tag == IOP::TAG_FT_GROUP || tag == IOP::TAG_DCE_STRING_BINDING || tag == IOP::TAG_DCE_BINDING_NAME - || tag == IOP::TAG_DCE_NO_PIPES - || tag == IOP::TAG_DCE_SEC_MECH); + || tag == IOP::TAG_DCE_NO_PIPES); } ACE_INLINE IOP::MultipleComponentProfile& diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp index 2536b674829..df687262830 100644 --- a/TAO/tao/corbafwd.cpp +++ b/TAO/tao/corbafwd.cpp @@ -10,7 +10,10 @@ char * CORBA::string_dup (const char *str) { if (!str) - return 0; + { + errno = EINVAL; + return 0; + } size_t len = ACE_OS::strlen (str); @@ -29,7 +32,10 @@ CORBA::WChar* CORBA::wstring_dup (const WChar *const str) { if (!str) - return 0; + { + errno = EINVAL; + return 0; + } CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::wslen (str)); return ACE_OS::wscpy (retval, str); diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 60720f3ea4c..2c6a27b3ad0 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -391,12 +391,9 @@ TAO_NAMESPACE CORBA typedef Char &Char_out; // = String memory management. - TAO_NAMESPACE_INLINE_FUNCTION Char* string_alloc (ULong len); - TAO_NAMESPACE_STORAGE_CLASS Char* string_dup (const Char *); - TAO_NAMESPACE_INLINE_FUNCTION void string_free (Char *); - - // This is a TAO extension and must go away.... - TAO_NAMESPACE_STORAGE_CLASS Char* string_copy (const Char *); + TAO_NAMESPACE_INLINE_FUNCTION char* string_alloc (ULong len); + TAO_NAMESPACE_STORAGE_CLASS char* string_dup (const char *); + TAO_NAMESPACE_INLINE_FUNCTION void string_free (char *); typedef CORBA_String_var String_var; typedef CORBA_String_out String_out; @@ -958,7 +955,6 @@ TAO_NAMESPACE_CLOSE // end of class (namespace) CORBA // Tag for storing multiple endpoints within a single profile. #define TAO_TAG_ENDPOINTS 0x54414f00U -#define TAO_TAG_SSL_ENDPOINTS 0x54414f01U // We reserved the range 0x54414f00 - 0x54414f0f with the OMG to // define our own service context list entries. diff --git a/TAO/tao/diffs/IOP.diff b/TAO/tao/diffs/IOP.diff new file mode 100644 index 00000000000..ee716db57cb --- /dev/null +++ b/TAO/tao/diffs/IOP.diff @@ -0,0 +1,71 @@ +--- IOPC.h.old Sun Sep 24 17:32:44 2000 ++++ IOPC.h Sun Sep 24 19:47:04 2000 +@@ -21,17 +21,18 @@ + + #ifndef _TAO_IDL_IOPC_H_ + #define _TAO_IDL_IOPC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/TAO_Export.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + +-#include "tao/TAO_Export.h" ++#include "tao/CDR.h" ++#include "tao/Sequence.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO + #endif + #define TAO_EXPORT_MACRO TAO_Export +--- IOPS.h.old Sun Sep 24 17:32:44 2000 ++++ IOPS.h Sun Sep 24 19:47:08 2000 +@@ -28,14 +28,10 @@ + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + +-#include "tao/PortableServer/PortableServer.h" +-#include "tao/PortableServer/Servant_Base.h" +-#include "tao/PortableServer/Collocated_Object.h" +- + #if defined(_MSC_VER) + #if (_MSC_VER >= 1200) + #pragma warning(push) + #endif /* _MSC_VER >= 1200 */ + #pragma warning(disable:4250) +--- IOPC.cpp.old Sun Sep 24 17:32:44 2000 ++++ IOPC.cpp Sun Sep 24 19:47:04 2000 +@@ -23,10 +23,13 @@ + + #if !defined (__ACE_INLINE__) + #include "IOPC.i" + #endif /* !defined INLINE */ + ++#include "tao/Any.h" ++#include "tao/Typecode.h" ++ + static const CORBA::Long _oc_IOP_ProfileId[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order + 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ProfileId:1.0 + 10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000), // name = ProfileId +--- IOPS.cpp.old Sun Sep 24 17:32:44 2000 ++++ IOPS.cpp Sun Sep 24 19:47:08 2000 +@@ -18,12 +18,10 @@ + // + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + + #include "IOPS.h" +-#include "tao/PortableServer/Object_Adapter.h" +-#include "tao/PortableServer/Operation_Table.h" + + #if !defined (__ACE_INLINE__) + #include "IOPS.i" + #endif /* !defined INLINE */ + diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index b41b5d06375..a5491da6cec 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -14,7 +14,7 @@ ACE_RCSID(tao, params, "$Id$") TAO_ORB_Parameters::TAO_ORB_Parameters (void) : preconnects_list_ (), endpoints_list_ (), - init_ref_ (), + mcast_discovery_endpoint_ (), default_init_ref_ (), sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ), sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ), diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 2c7ad5d01c0..f1a390f11e9 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -25,6 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/CORBA_String.h" #include "ace/SString.h" // Forward decls. @@ -87,8 +88,8 @@ public: // Set/Get the port of services locatable through multicast. const char *mcast_discovery_endpoint (void) const; - void mcast_discovery_endpoint (const ACE_CString &mde); - // Set/Get address:port for Multicast Discovery Protocol for + void mcast_discovery_endpoint (const char *mde); + // Get/Set address:port for Multicast Discovery Protocol for // the Naming Service. int sock_rcvbuf_size (void) const; @@ -122,7 +123,7 @@ public: // default we use the full ascii names. char *default_init_ref (void) const; - void default_init_ref (const ACE_CString &default_init_ref); + void default_init_ref (const char *default_init_ref); // Set/Get the Init Reference of an arbitrary ObjectID. int std_profile_components (void) const; @@ -161,13 +162,10 @@ private: CORBA::UShort service_port_[NO_OF_MCAST_SERVICES]; // Port numbers of the configured services. - ACE_CString mcast_discovery_endpoint_; + CORBA::String_var mcast_discovery_endpoint_; // address:port for Multicast Discovery Protocol for the Naming // Service. - ACE_CString init_ref_; - // Initial Reference supplied as <ObjectID>:<IOR> - ACE_CString default_init_ref_; // List of comma separated prefixes from ORBDefaultInitRef. diff --git a/TAO/tao/params.i b/TAO/tao/params.i index 2856f13e65c..1cc26a6f065 100644 --- a/TAO/tao/params.i +++ b/TAO/tao/params.i @@ -119,19 +119,19 @@ TAO_ORB_Parameters::service_port (MCAST_SERVICEID service_id) const } ACE_INLINE void -TAO_ORB_Parameters::mcast_discovery_endpoint (const ACE_CString &mde) +TAO_ORB_Parameters::mcast_discovery_endpoint (const char *mde) { - this->mcast_discovery_endpoint_ = mde; + this->mcast_discovery_endpoint_ = CORBA::string_dup (mde); } ACE_INLINE const char * TAO_ORB_Parameters::mcast_discovery_endpoint (void) const { - return this->mcast_discovery_endpoint_.c_str (); + return this->mcast_discovery_endpoint_.in (); } ACE_INLINE void -TAO_ORB_Parameters::default_init_ref (const ACE_CString &default_init_ref) +TAO_ORB_Parameters::default_init_ref (const char *default_init_ref) { this->default_init_ref_ = default_init_ref; } |