diff options
| author | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-15 17:24:52 +0000 |
|---|---|---|
| committer | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-15 17:24:52 +0000 |
| commit | 5322a39e6901a6bb19a735ae428c1fb10664cc1f (patch) | |
| tree | e135b60a9d5cf3fd94e2774a900705c7554da8fe | |
| parent | fc71ff4390f3a0569a96aa7919d521acb60186df (diff) | |
| download | ATCD-miop.tar.gz | |
*** empty log message ***miop
34 files changed, 4385 insertions, 3940 deletions
diff --git a/TAO/tao/PortableGroup/UIPMC_Profile.cpp b/TAO/tao/PortableGroup/UIPMC_Profile.cpp index 98e590db8f4..1af1211078e 100644 --- a/TAO/tao/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/tao/PortableGroup/UIPMC_Profile.cpp @@ -126,26 +126,16 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) if (minor <= TAO_DEF_MIOP_MINOR) this->version_.minor = minor; - // Decode endpoint. - CORBA::Short ip_version; - if (!(cdr.read_short (ip_version) - && ip_version == MIOP::IPv4)) + // Decode the endpoint. + ACE_CString address; + CORBA::UShort port; + + if (!(cdr.read_string (address) + && cdr.read_ushort (port))) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::decode - Unexpected IP version %d\n"), - ip_version)); - return -1; - } - - /* Read in the IPv4 port and address */ - if (cdr.read_ushort (this->endpoint_.port_) == 0 - || cdr.read_octet_array (this->endpoint_.class_d_address_, 4) == 0) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::decode - ") - ACE_TEXT ("error while decoding host/port"))); + ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::decode - Couldn't unmarshal address and port!\n"))); return -1; } @@ -162,8 +152,12 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) if (cdr.good_bit ()) { - // Tell the endpoint to update its cached address. @@ Frank: Fix this smelly piece of code! - this->endpoint_.update_object_addr (); + // If everything was successful, update the endpoint's address + // and port with the new data. + + ACE_INET_Addr addr (port, address.c_str ()); + + this->endpoint_.object_addr (addr); return 1; } @@ -173,16 +167,9 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) void -TAO_UIPMC_Profile::parse_string (const char * /*string*/, +TAO_UIPMC_Profile::parse_string (const char *string, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA::INV_OBJREF ( - CORBA_SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - EINVAL), - CORBA::COMPLETED_NO)); - -/* // Remove the "N.n@" version prefix, if it exists, and verify the // version is one that we accept. @@ -203,143 +190,187 @@ TAO_UIPMC_Profile::parse_string (const char * /*string*/, if (this->version_.major != TAO_DEF_GIOP_MAJOR || this->version_.minor > TAO_DEF_GIOP_MINOR) { - ACE_THROW_RETURN (CORBA::INV_OBJREF ( + ACE_THROW (CORBA::INV_OBJREF ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO)); + } + + // + // Parse the group_id. + // + + // Parse the group component version. + if (isdigit (string [0]) && + string[1] == '.' && + isdigit (string [2]) && + string[3] == '-') + { + CORBA::Char major; + CORBA::Char minor; + + major = (char) (string [0] - '0'); + minor = (char) (string [2] - '0'); + + // Verify that a supported version of MIOP is specified. + if (major != TAO_DEF_MIOP_MAJOR || + minor > TAO_DEF_MIOP_MINOR) + { + ACE_THROW (CORBA::INV_OBJREF ( CORBA_SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, EINVAL), - CORBA::COMPLETED_NO), - -1); + CORBA::COMPLETED_NO)); + } + + // Skip over "N.n-" + string += 4; + } + else + { + // The group component version is mandatory. + ACE_THROW (CORBA::INV_OBJREF ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO)); } - // Pull off the "hostname:port/" part of the objref - // Copy the string because we are going to modify it... - CORBA::String_var copy (string); + // Parse the group_domain_id. + // The Domain ID is terminated with a '-'. - char *start = copy.inout (); - char *cp_pos = ACE_OS::strchr (start, ':'); // Look for a port + // Wrap the string in a ACE_CString + ACE_CString ace_str (string, 0, 0); - char *okd = ACE_OS::strchr (start, this->object_key_delimiter_); + // Look for the group domain delimitor. + int pos = ace_str.find ('-'); - if (okd == 0) + if (pos == ACE_CString::npos) { - // No object key delimiter! - ACE_THROW_RETURN (CORBA::INV_OBJREF ( - CORBA_SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - EINVAL), - CORBA::COMPLETED_NO), - -1); + // The group_domain_id is mandatory, so throw an + // exception if it isn't found. + ACE_THROW (CORBA::INV_OBJREF ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO)); } - // The default port number. - const char def_port [] = ":683"; + // Save the group_domain_id. + ACE_CString group_domain_id = ace_str.substring (0, pos); - // Length of port. - CORBA::ULong length = 0; + // Parse the group_id. + // The group_id is terminated with a '-' or a '/'. + + // Skip past the last '-'. + pos++; + int end_pos = ace_str.find ('-',pos); - // Length of host string. - CORBA::ULong length_host = 0; + CORBA::Boolean parse_group_ref_version_flag = 0; - // Length of <cp> - CORBA::ULong length_cp = - ACE_OS::strlen ((const char *)okd) + sizeof (def_port); - - CORBA::String_var cp = CORBA::string_alloc (length_cp); - - if (cp_pos == 0) + if (end_pos != ACE_CString::npos) { - // No host/port delimiter! Dont raise an exception. Use the - // default port No. 683 - ACE_OS::strcpy (cp, def_port); - ACE_OS::strcat (cp, okd); - - length = - ACE_OS::strlen (cp.in ()) - - ACE_OS::strlen ((const char *)okd) - - 1; - - length_host = - ACE_OS::strlen (start) + - sizeof (def_port) - - ACE_OS::strlen (cp.in ()) -1; + // String was terminated by a '-', so there's a group + // reference version to be parsed. + parse_group_ref_version_flag = 1; } else { - // The port is specified: - cp = (const char *)cp_pos; - - length = - ACE_OS::strlen (cp.in ()) - - ACE_OS::strlen ((const char *)okd) + 1; + // Look for a slash as the separator. + end_pos = ace_str.find ('/', pos); - length_host = - ACE_OS::strlen ((const char *)start) - - ACE_OS::strlen (cp.in ()); + if (end_pos == ACE_CString::npos) + { + // The Group ID is mandatory, so throw an exception. + ACE_THROW (CORBA::INV_OBJREF ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO)); + } } - CORBA::String_var tmp = CORBA::string_alloc (length); + // Get the domain_id. + ACE_CString str_domain_id = ace_str.substring (pos, end_pos - pos); - ACE_OS::strncpy (tmp.inout (), cp.in () + 1, length); - tmp[length] = '\0'; + // Convert the domain_id into numerical form. + // @@ group_id is actually 64 bits, but strtoul only can parse 32 bits. + // @@ Need a 64 bit strtoul... + PortableGroup::ObjectGroupId group_id = + ACE_OS::strtoul (str_domain_id.c_str (), 0, 10); - this->endpoint_.port_ = (CORBA::UShort) ACE_OS::atoi (tmp.in ()); - - tmp = CORBA::string_alloc (length_host); + PortableGroup::ObjectGroupRefVersion ref_version = 0; + if (parse_group_ref_version_flag) + { + // Try to find the group version. It is terminated by a '/'. + pos = end_pos + 1; + end_pos = ace_str.find ('/', pos); + if (end_pos == ACE_CString::npos) + { + // The group version was expected but not found, + // so throw an exception. + ACE_THROW (CORBA::INV_OBJREF ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO)); + } - ACE_OS::strncpy (tmp.inout (), start, length_host); - tmp[length_host] = '\0'; + ACE_CString str_group_ref_ver = ace_str.substring (pos, end_pos - pos); - this->endpoint_.host_ = tmp._retn (); + ref_version = + ACE_OS::strtoul (str_group_ref_ver.c_str (), 0, 10); + } - ACE_INET_Addr host_addr; + // Parse the group multicast address. + // The multicast address is terminated by a ':'. + pos = end_pos + 1; + end_pos = ace_str.find (':', pos); - if (ACE_OS::strcmp (this->endpoint_.host_.in (), "") == 0) + if (end_pos == ACE_CString::npos) { - char tmp_host [MAXHOSTNAMELEN + 1]; - - // If no host is specified: assign the default host : the local host. - if (host_addr.get_host_name (tmp_host, - sizeof (tmp_host)) != 0) - { - const char *tmp = host_addr.get_host_addr (); - if (tmp == 0) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n\nTAO (%P|%t) ") - ACE_TEXT ("UIPMC_Profile::parse_string ") - ACE_TEXT ("- %p\n\n"), - ACE_TEXT ("cannot determine hostname"))); - return -1; - } - this->endpoint_.host_ = tmp; - } - else - { - this->endpoint_.host_ = (const char *) tmp_host; - } + // The multicast address is mandatory, so throw an exception, + // since it wasn't found. + ACE_THROW (CORBA::INV_OBJREF ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO)); } - if (this->endpoint_.object_addr_.set (this->endpoint_.port_, - this->endpoint_.host_.in ()) == -1) + ACE_CString mcast_addr = ace_str.substring (pos, end_pos - pos); + + // Parse the multicast port number. + + // First check that there's something left in the string. + pos = end_pos + 1; + if (ace_str[pos] == '\0') { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Error Occured !") - ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::parse_string - \n") - ACE_TEXT ("TAO (%P|%t) ACE_INET_Addr::set () failed"))); - } - return -1; + // The multicast port is mandatory, so throw an exception, + // since it wasn't found. + ACE_THROW (CORBA::INV_OBJREF ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO)); } - start = ++okd; // increment past the object key separator + CORBA::UShort mcast_port = + ACE_static_cast (CORBA::UShort, + ACE_OS::strtoul (ace_str.c_str () + pos, 0, 10)); - TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start); + // + // Finally, set all of the fields of the profile. + // + + ACE_INET_Addr addr (mcast_port, mcast_addr.c_str ()); + this->endpoint_.object_addr (addr); + + this->set_group_info (group_domain_id.c_str (), + group_id, + ref_version); - return 1; -*/ } CORBA::Boolean @@ -412,14 +443,11 @@ TAO_UIPMC_Profile::to_string (CORBA::Environment &) static const char digits [] = "0123456789"; ACE_OS::sprintf (buf, - "%sloc://%c.%c@%d.%d.%d.%d:%d%c%s", + "%sloc://%c.%c@%s:%d%c%s", ::prefix_, digits [this->version_.major], digits [this->version_.minor], - this->endpoint_.class_d_address_[0], - this->endpoint_.class_d_address_[1], - this->endpoint_.class_d_address_[2], - this->endpoint_.class_d_address_[3], + this->endpoint_.get_host_addr (), this->endpoint_.port ()); return buf; } @@ -514,15 +542,12 @@ TAO_UIPMC_Profile::create_profile_body (TAO_OutputCDR &encap) const encap.write_octet (this->version_.major); encap.write_octet (this->version_.minor); - // IP Version. - encap.write_short (MIOP::IPv4); + // Address. + encap.write_string (this->endpoint_.get_host_addr ()); - // The IPv4 port number. + // Port number. encap.write_ushort (this->endpoint_.port ()); - // The IPv4 multicast address (MSB first). - encap.write_octet_array (this->endpoint_.class_d_address_, 4); - // UIPMC is only supported by versions of GIOP that have tagged components, // so unconditionally encode the components. this->tagged_components ().encode (encap); @@ -585,24 +610,41 @@ TAO_UIPMC_Profile::decode_endpoints (void) } */ -int -TAO_UIPMC_Profile::add_group_component (const char *domain_id, - PortableGroup::ObjectGroupId group_id, - PortableGroup::ObjectGroupRefVersion ref_version) +void +TAO_UIPMC_Profile::set_group_info (const char *domain_id, + PortableGroup::ObjectGroupId group_id, + PortableGroup::ObjectGroupRefVersion ref_version) +{ + // First, record the group information. + this->group_domain_id_.set (domain_id); + this->group_id_ = group_id; + this->ref_version_ = ref_version; + + // Update the cached version of the group component. + this->update_cached_group_component (); +} + +void +TAO_UIPMC_Profile::update_cached_group_component (void) { PortableGroup::TagGroupTaggedComponent group; // Encode the data structure. - group.version.major = TAO_DEF_MIOP_MAJOR; - group.version.minor = TAO_DEF_MIOP_MINOR; + group.component_version.major = TAO_DEF_MIOP_MAJOR; + group.component_version.minor = TAO_DEF_MIOP_MINOR; - group.group_domain_id = CORBA::string_dup (domain_id); - group.object_group_id = group_id; - group.object_group_ref_version = ref_version; + group.group_domain_id = CORBA::string_dup (this->group_domain_id_.c_str ()); + group.object_group_id = this->group_id_; + group.object_group_ref_version = this->ref_version_; TAO_OutputCDR out_cdr; if ((out_cdr << group) == 0) - return -1; + { + ACE_DEBUG ((LM_DEBUG, + "Error marshaling group component!")); + return; + } + CORBA::ULong length = out_cdr.total_length (); IOP::TaggedComponent tagged_component; @@ -624,14 +666,33 @@ TAO_UIPMC_Profile::add_group_component (const char *domain_id, // Add component with encoded endpoint data to this profile's // TaggedComponents. this->tagged_components_.set_component (tagged_component); - return 0; } -void -TAO_UIPMC_Profile::request_target_specifier (TAO_Target_Specification &target_spec) +void +TAO_UIPMC_Profile::request_target_specifier ( + TAO_Target_Specification &target_spec, + TAO_Target_Specification::TAO_Target_Address required_type, + CORBA::Environment &ACE_TRY_ENV) { - // Point the target specifier to our Tagged Profile - target_spec.target_specifier (this->create_tagged_profile ()); + // Fill out the target specifier based on the required type. + switch (required_type) + { + case TAO_Target_Specification::Default_Addr: + case TAO_Target_Specification::Profile_Addr: + + // Only using a profile as the target specifier is supported + // at this time. Object keys are strictly not supported since + // UIPMC profiles do not have object keys. + target_spec.target_specifier ( + this->create_tagged_profile ()); + break; + + case TAO_Target_Specification::Key_Addr: + case TAO_Target_Specification::Reference_Addr: + default: + // Unsupported or unknown required type. Throw an exception. + ACE_THROW (CORBA::MARSHAL ()); + } } int @@ -673,36 +734,23 @@ TAO_UIPMC_Profile::extract_group_component (IOP::TaggedProfile &profile, if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::decode - v%d.%d\n"), + ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::extract_group_component - v%d.%d\n"), major, minor)); } return -1; } - // Decode endpoint. - CORBA::Short ip_version; - if (!(cdr.read_short (ip_version) - && ip_version == MIOP::IPv4)) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::decode - Unexpected IP version %d\n"), - ip_version)); - return -1; - } - - CORBA::Octet class_d_address_[4]; - CORBA::UShort port_; - - /* Read in the IPv4 port and address */ - if (cdr.read_ushort (port_) == 0 - || cdr.read_octet_array (class_d_address_, 4) == 0) + // Decode the endpoint. + ACE_CString address; + CORBA::UShort port; + + if (!(cdr.read_string (address) + && cdr.read_ushort (port))) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::decode - ") - ACE_TEXT ("error while decoding host/port"))); + ACE_TEXT ("TAO (%P|%t) UIPMC_Profile::extract_group_component - Couldn't unmarshal address and port!\n"))); return -1; } diff --git a/TAO/tao/PortableGroup/UIPMC_Profile.h b/TAO/tao/PortableGroup/UIPMC_Profile.h index be9f992e1e8..1200704a8cd 100644 --- a/TAO/tao/PortableGroup/UIPMC_Profile.h +++ b/TAO/tao/PortableGroup/UIPMC_Profile.h @@ -146,7 +146,10 @@ public: /// Set the request target specifier to point to a tagged profile /// containing the GroupId associated with this profile. - virtual void request_target_specifier (TAO_Target_Specification &target_spec); + virtual void request_target_specifier ( + TAO_Target_Specification &target_spec, + TAO_Target_Specification::TAO_Target_Address required_type, + CORBA::Environment &ACE_TRY_ENV); /// Returns true since this profile can specify multicast endpoints. virtual int supports_multicast (void) const; @@ -155,15 +158,20 @@ public: PortableGroup::TagGroupTaggedComponent &group); /// Add the mandatory group component to this profile. - int add_group_component (const char *domain_id, - PortableGroup::ObjectGroupId group_id, - PortableGroup::ObjectGroupRefVersion ref_version); + void set_group_info (const char *domain_id, + PortableGroup::ObjectGroupId group_id, + PortableGroup::ObjectGroupRefVersion ref_version); private: /// Creates an encapsulation of the ProfileBody struct in the <cdr> void create_profile_body (TAO_OutputCDR &cdr) const; + /// Update the group component in the cached list of tagged + /// components. This needs to be called whenever the group_domain_id, + /// group_id, or ref_version changes. + void update_cached_group_component (void); + protected: /** @@ -193,8 +201,18 @@ private: /// some of the API calls. TAO_ObjectKey object_key_; - /// Our tagged profile + /// Cached version of our tagged profile. IOP::TaggedProfile tagged_profile_; + + /// Group Domain ID. + ACE_CString group_domain_id_; + + /// Our group ID within the group domain. + PortableGroup::ObjectGroupId group_id_; + + /// The group reference's version. + PortableGroup::ObjectGroupRefVersion ref_version_; + }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableGroup/miop.cpp b/TAO/tao/PortableGroup/miop.cpp index 79e90f2f868..7b55e1c72d3 100644 --- a/TAO/tao/PortableGroup/miop.cpp +++ b/TAO/tao/PortableGroup/miop.cpp @@ -69,15 +69,10 @@ TAO_MOGF_impl::create_group ( CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - // Add the group component to the UIPMC profile. - if (uipmc_profile->add_group_component (this->domain_id_.c_str (), - this->next_group_id (), - 0) != 0) - { - delete uipmc_profile; - ACE_THROW_RETURN (CORBA::INTERNAL (), - CORBA::Object::_nil ()); - } + // Set the group component to the UIPMC profile. + uipmc_profile->set_group_info (this->domain_id_.c_str (), + this->next_group_id (), + 0); // Relinquish ownership of the UIPMC profile to mp. diff --git a/TAO/tao/PortableGroup/miop.pidl b/TAO/tao/PortableGroup/miop.pidl index 862005a2a53..547b1f2c6ab 100644 --- a/TAO/tao/PortableGroup/miop.pidl +++ b/TAO/tao/PortableGroup/miop.pidl @@ -46,6 +46,7 @@ #define MIOP_IDL #include <IOP.pidl> +#include <GIOP.pidl> #pragma prefix "omg.org" @@ -55,50 +56,24 @@ module MIOP struct PacketHeader_1_0 { - char magic[4]; - octet hdr_version; - octet flags; - unsigned short packet_length; - unsigned long packet_number; - unsigned long number_of_packets; - UniqueId Id; + char magic[4]; + octet hdr_version; + octet flags; + unsigned short packet_length; + unsigned long packet_number; + unsigned long number_of_packets; + UniqueId Id; }; - struct Version - { - octet major; - octet minor; - }; - - typedef short IPVersion; - - const IPVersion IPv4 = 0; - const IPVersion IPv6 = 1; - - struct UsingIpv4 - { - unsigned short port; - octet class_d_address[4]; // @@ Frank: changed to octet to avoid lots of casting - }; - - struct UsingIpv6 - { - unsigned long port; - string address; - }; + typedef GIOP::Version Version; - union IPEndpoints switch (IPVersion) - { - case IPv4: - UsingIpv4 ipv4_endpoints; - case IPv6: - UsingIpv6 ipv6_endpoints; - }; + typedef string Address; struct UIPMC_ProfileBody { - Version miop_version; - IPEndpoints endpoints; + Version miop_version; + Address the_address; + short the_port; sequence<IOP::TaggedComponent> components; }; diff --git a/TAO/tao/PortableGroup/miopC.cpp b/TAO/tao/PortableGroup/miopC.cpp index 5822ae1b41a..21ca8b04f6d 100644 --- a/TAO/tao/PortableGroup/miopC.cpp +++ b/TAO/tao/PortableGroup/miopC.cpp @@ -38,19 +38,19 @@ #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_BOUNDED_SEQUENCE_MIOP_UNIQUEID_252_CS_) #define __TAO_BOUNDED_SEQUENCE_MIOP_UNIQUEID_252_CS_ - void + void MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::_allocate_buffer (CORBA::ULong /* length */) // allocate a buffer of the requested length. The buffer is allocated for the // right type { this->buffer_ = _TAO_Bounded_Sequence_MIOP_UniqueId_252::allocbuf (252U); } - - void + + void MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::_deallocate_buffer (void) // deallocate the buffer { @@ -60,17 +60,17 @@ _TAO_Bounded_Sequence_MIOP_UniqueId_252::freebuf (tmp); this->buffer_ = 0; } - + MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::~_TAO_Bounded_Sequence_MIOP_UniqueId_252 (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_MIOP_UNIQUEID_CS_) #define _MIOP_UNIQUEID_CS_ @@ -82,21 +82,21 @@ MIOP::UniqueId::UniqueId (void) {} MIOP::UniqueId::UniqueId (CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Bounded_Sequence_MIOP_UniqueId_252 #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Bounded_Sequence<CORBA::Octet, 252U> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (length, buffer, release) {} MIOP::UniqueId::UniqueId (const UniqueId &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Bounded_Sequence_MIOP_UniqueId_252 #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Bounded_Sequence<CORBA::Octet, 252U> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} MIOP::UniqueId::~UniqueId (void) // dtor @@ -114,17 +114,17 @@ static const CORBA::Long _oc_MIOP_UniqueId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f556e69), - ACE_NTOHL (0x71756549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d494f50), + ACE_NTOHL (0x2f556e69), + ACE_NTOHL (0x71756549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/MIOP/UniqueId:1.0 9, - ACE_NTOHL (0x556e6971), - ACE_NTOHL (0x75654964), + ACE_NTOHL (0x556e6971), + ACE_NTOHL (0x75654964), ACE_NTOHL (0x0), // name = UniqueId CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -152,25 +152,25 @@ static const CORBA::Long _oc_MIOP_PacketHeader_1_0[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f506163), - ACE_NTOHL (0x6b657448), - ACE_NTOHL (0x65616465), - ACE_NTOHL (0x725f315f), - ACE_NTOHL (0x303a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d494f50), + ACE_NTOHL (0x2f506163), + ACE_NTOHL (0x6b657448), + ACE_NTOHL (0x65616465), + ACE_NTOHL (0x725f315f), + ACE_NTOHL (0x303a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/MIOP/PacketHeader_1_0:1.0 17, - ACE_NTOHL (0x5061636b), - ACE_NTOHL (0x65744865), - ACE_NTOHL (0x61646572), - ACE_NTOHL (0x5f315f30), + ACE_NTOHL (0x5061636b), + ACE_NTOHL (0x65744865), + ACE_NTOHL (0x61646572), + ACE_NTOHL (0x5f315f30), ACE_NTOHL (0x0), // name = PacketHeader_1_0 7, // member count 6, - ACE_NTOHL (0x6d616769), + ACE_NTOHL (0x6d616769), ACE_NTOHL (0x63000000), // name = magic CORBA::tk_array, // typecode kind 12, // encapsulation length @@ -180,35 +180,35 @@ static const CORBA::Long _oc_MIOP_PacketHeader_1_0[] = 4U, 12, - ACE_NTOHL (0x6864725f), - ACE_NTOHL (0x76657273), + ACE_NTOHL (0x6864725f), + ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = hdr_version CORBA::tk_octet, 6, - ACE_NTOHL (0x666c6167), + ACE_NTOHL (0x666c6167), ACE_NTOHL (0x73000000), // name = flags CORBA::tk_octet, 14, - ACE_NTOHL (0x7061636b), - ACE_NTOHL (0x65745f6c), - ACE_NTOHL (0x656e6774), + ACE_NTOHL (0x7061636b), + ACE_NTOHL (0x65745f6c), + ACE_NTOHL (0x656e6774), ACE_NTOHL (0x68000000), // name = packet_length CORBA::tk_ushort, 14, - ACE_NTOHL (0x7061636b), - ACE_NTOHL (0x65745f6e), - ACE_NTOHL (0x756d6265), + ACE_NTOHL (0x7061636b), + ACE_NTOHL (0x65745f6e), + ACE_NTOHL (0x756d6265), ACE_NTOHL (0x72000000), // name = packet_number CORBA::tk_ulong, 18, - ACE_NTOHL (0x6e756d62), - ACE_NTOHL (0x65725f6f), - ACE_NTOHL (0x665f7061), - ACE_NTOHL (0x636b6574), + ACE_NTOHL (0x6e756d62), + ACE_NTOHL (0x65725f6f), + ACE_NTOHL (0x665f7061), + ACE_NTOHL (0x636b6574), ACE_NTOHL (0x73000000), // name = number_of_packets CORBA::tk_ulong, @@ -218,17 +218,17 @@ static const CORBA::Long _oc_MIOP_PacketHeader_1_0[] = 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f556e69), - ACE_NTOHL (0x71756549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d494f50), + ACE_NTOHL (0x2f556e69), + ACE_NTOHL (0x71756549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/MIOP/UniqueId:1.0 9, - ACE_NTOHL (0x556e6971), - ACE_NTOHL (0x75654964), + ACE_NTOHL (0x556e6971), + ACE_NTOHL (0x75654964), ACE_NTOHL (0x0), // name = UniqueId CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -288,7 +288,7 @@ MIOP::PacketHeader_1_0::_magic_free (MIOP::PacketHeader_1_0::_magic_slice *_tao_ delete [] _tao_slice; } -void +void MIOP::PacketHeader_1_0::_magic_copy (MIOP::PacketHeader_1_0::_magic_slice * _tao_to, const MIOP::PacketHeader_1_0::_magic_slice *_tao_from) { // copy each individual element @@ -300,32 +300,48 @@ static const CORBA::Long _oc_MIOP_Version[] = { TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f566572), - ACE_NTOHL (0x73696f6e), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d494f50), + ACE_NTOHL (0x2f566572), + ACE_NTOHL (0x73696f6e), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/MIOP/Version:1.0 8, - ACE_NTOHL (0x56657273), + ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e00), // name = Version - 2, // member count - 6, - ACE_NTOHL (0x6d616a6f), - ACE_NTOHL (0x72000000), // name = major - CORBA::tk_octet, + CORBA::tk_struct, // typecode kind + 88, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x47494f50), + ACE_NTOHL (0x2f566572), + ACE_NTOHL (0x73696f6e), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/GIOP/Version:1.0 + 8, + ACE_NTOHL (0x56657273), + ACE_NTOHL (0x696f6e00), // name = Version + 2, // member count + 6, + ACE_NTOHL (0x6d616a6f), + ACE_NTOHL (0x72000000), // name = major + CORBA::tk_octet, + + 6, + ACE_NTOHL (0x6d696e6f), + ACE_NTOHL (0x72000000), // name = minor + CORBA::tk_octet, - 6, - ACE_NTOHL (0x6d696e6f), - ACE_NTOHL (0x72000000), // name = minor - CORBA::tk_octet, }; static CORBA::TypeCode _tc_TAO_tc_MIOP_Version ( - CORBA::tk_struct, + CORBA::tk_alias, sizeof (_oc_MIOP_Version), (char *) &_oc_MIOP_Version, 0, @@ -337,575 +353,138 @@ TAO_NAMESPACE_BEGIN (MIOP) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Version, &_tc_TAO_tc_MIOP_Version) TAO_NAMESPACE_END -void MIOP::Version::_tao_any_destructor (void *x) -{ - Version *tmp = ACE_static_cast (Version*,x); - delete tmp; -} - -static const CORBA::Long _oc_MIOP_IPVersion[] = +static const CORBA::Long _oc_MIOP_Address[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f495056), - ACE_NTOHL (0x65727369), - ACE_NTOHL (0x6f6e3a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/MIOP/IPVersion:1.0 - 10, - ACE_NTOHL (0x49505665), - ACE_NTOHL (0x7273696f), - ACE_NTOHL (0x6e000000), // name = IPVersion - CORBA::tk_short, - -}; - -static CORBA::TypeCode _tc_TAO_tc_MIOP_IPVersion ( - CORBA::tk_alias, - sizeof (_oc_MIOP_IPVersion), - (char *) &_oc_MIOP_IPVersion, - 0, - sizeof (MIOP::IPVersion) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (MIOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IPVersion, &_tc_TAO_tc_MIOP_IPVersion) -TAO_NAMESPACE_END - -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (MIOP) -TAO_NAMESPACE_DEFINE (const CORBA::Short, IPv4, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (MIOP) -TAO_NAMESPACE_DEFINE (const CORBA::Short, IPv6, 1) -TAO_NAMESPACE_END -static const CORBA::Long _oc_MIOP_UsingIpv4[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f557369), - ACE_NTOHL (0x6e674970), - ACE_NTOHL (0x76343a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/MIOP/UsingIpv4:1.0 - 10, - ACE_NTOHL (0x5573696e), - ACE_NTOHL (0x67497076), - ACE_NTOHL (0x34000000), // name = UsingIpv4 - 2, // member count - 5, - ACE_NTOHL (0x706f7274), - ACE_NTOHL (0x0), // name = port - CORBA::tk_ushort, - - 16, - ACE_NTOHL (0x636c6173), - ACE_NTOHL (0x735f645f), - ACE_NTOHL (0x61646472), - ACE_NTOHL (0x65737300), // name = class_d_address - CORBA::tk_array, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, - - 4U, - -}; - -static CORBA::TypeCode _tc_TAO_tc_MIOP_UsingIpv4 ( - CORBA::tk_struct, - sizeof (_oc_MIOP_UsingIpv4), - (char *) &_oc_MIOP_UsingIpv4, - 0, - sizeof (MIOP::UsingIpv4) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (MIOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsingIpv4, &_tc_TAO_tc_MIOP_UsingIpv4) -TAO_NAMESPACE_END - -void MIOP::UsingIpv4::_tao_any_destructor (void *x) -{ - UsingIpv4 *tmp = ACE_static_cast (UsingIpv4*,x); - delete tmp; -} - -void MIOP::UsingIpv4::_class_d_address_forany::_tao_any_destructor (void *x) -{ - _class_d_address_slice *tmp = ACE_static_cast (_class_d_address_slice*,x); - _class_d_address_free (tmp); -} - -MIOP::UsingIpv4::_class_d_address_slice * -MIOP::UsingIpv4::_class_d_address_dup (const MIOP::UsingIpv4::_class_d_address_slice *_tao_src_array) -{ - MIOP::UsingIpv4::_class_d_address_slice *_tao_dup_array = MIOP::UsingIpv4::_class_d_address_alloc (); - if (!_tao_dup_array) return (MIOP::UsingIpv4::_class_d_address_slice *)0; - MIOP::UsingIpv4::_class_d_address_copy (_tao_dup_array, _tao_src_array); - return _tao_dup_array; -} - -MIOP::UsingIpv4::_class_d_address_slice * -MIOP::UsingIpv4::_class_d_address_alloc (void) -{ - MIOP::UsingIpv4::_class_d_address_slice *retval = 0; - ACE_NEW_RETURN (retval, CORBA::Octet[4], 0); - return retval; -} - -void -MIOP::UsingIpv4::_class_d_address_free (MIOP::UsingIpv4::_class_d_address_slice *_tao_slice) -{ - delete [] _tao_slice; -} - -void -MIOP::UsingIpv4::_class_d_address_copy (MIOP::UsingIpv4::_class_d_address_slice * _tao_to, const MIOP::UsingIpv4::_class_d_address_slice *_tao_from) -{ - // copy each individual element - for (CORBA::ULong i0 = 0; i0 < 4; i0++) - _tao_to[i0] = _tao_from[i0]; -} - -static const CORBA::Long _oc_MIOP_UsingIpv6[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f557369), - ACE_NTOHL (0x6e674970), - ACE_NTOHL (0x76363a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/MIOP/UsingIpv6:1.0 - 10, - ACE_NTOHL (0x5573696e), - ACE_NTOHL (0x67497076), - ACE_NTOHL (0x36000000), // name = UsingIpv6 - 2, // member count - 5, - ACE_NTOHL (0x706f7274), - ACE_NTOHL (0x0), // name = port - CORBA::tk_ulong, - + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d494f50), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/MIOP/Address:1.0 8, - ACE_NTOHL (0x61646472), - ACE_NTOHL (0x65737300), // name = address - CORBA::tk_string, + ACE_NTOHL (0x41646472), + ACE_NTOHL (0x65737300), // name = Address + CORBA::tk_string, 0U, // string length }; -static CORBA::TypeCode _tc_TAO_tc_MIOP_UsingIpv6 ( - CORBA::tk_struct, - sizeof (_oc_MIOP_UsingIpv6), - (char *) &_oc_MIOP_UsingIpv6, - 0, - sizeof (MIOP::UsingIpv6) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (MIOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsingIpv6, &_tc_TAO_tc_MIOP_UsingIpv6) -TAO_NAMESPACE_END - -void MIOP::UsingIpv6::_tao_any_destructor (void *x) -{ - UsingIpv6 *tmp = ACE_static_cast (UsingIpv6*,x); - delete tmp; -} - -// ************************************************************* -// Operations for union MIOP::IPEndpoints -// ************************************************************* - -// default constructor -MIOP::IPEndpoints::IPEndpoints (void) -{ - ACE_OS::memset (&this->disc_, 0, sizeof (this->disc_)); - ACE_OS::memset (&this->u_, 0, sizeof (this->u_)); - this->disc_ = 0; -} - -// copy constructor -MIOP::IPEndpoints::IPEndpoints (const ::MIOP::IPEndpoints &u) -{ - this->disc_ = u.disc_; - switch (this->disc_) - { -case 0: - { - this->u_.ipv4_endpoints_ = u.u_.ipv4_endpoints_; - } - break; - case 1: - { - if (u.u_.ipv6_endpoints_ == 0) - { - this->u_.ipv6_endpoints_ = 0; - } - else - { - ACE_NEW ( - this->u_.ipv6_endpoints_, - MIOP::UsingIpv6 (*u.u_.ipv6_endpoints_) - ); - } - } - break; - default: - break; - } -} - -// destructor -MIOP::IPEndpoints::~IPEndpoints (void) -{ - // finalize - this->_reset (this->disc_, 1); -} - -void MIOP::IPEndpoints::_tao_any_destructor (void *x) -{ - IPEndpoints *tmp = ACE_static_cast (IPEndpoints*,x); - delete tmp; -} - -// assignment operator -MIOP::IPEndpoints & -MIOP::IPEndpoints::operator= (const ::MIOP::IPEndpoints &u) -{ - if (&u == this) - { - return *this; - } - - this->_reset (u.disc_, 0); - this->disc_ = u.disc_; - - switch (this->disc_) - { - case 0: - { - this->u_.ipv4_endpoints_ = u.u_.ipv4_endpoints_; - } - break; - case 1: - { - if (u.u_.ipv6_endpoints_ == 0) - { - this->u_.ipv6_endpoints_ = 0; - } - else - { - ACE_NEW_RETURN ( - this->u_.ipv6_endpoints_, - MIOP::UsingIpv6 (*u.u_.ipv6_endpoints_), - *this - ); - } - } - break; - default: - break; - } - - return *this; -} - -// reset method to reset old values of a union -void MIOP::IPEndpoints::_reset (CORBA::Short, CORBA::Boolean /*finalize*/) -{ - switch (this->disc_) - { - case 0: - break; - case 1: - delete this->u_.ipv6_endpoints_; - this->u_.ipv6_endpoints_ = 0; - break; - default: - break; - } -} - -static const CORBA::Long _oc_MIOP_IPEndpoints[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f495045), - ACE_NTOHL (0x6e64706f), - ACE_NTOHL (0x696e7473), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/MIOP/IPEndpoints:1.0 - 12, - ACE_NTOHL (0x4950456e), - ACE_NTOHL (0x64706f69), - ACE_NTOHL (0x6e747300), // name = IPEndpoints - CORBA::tk_short, - - -1, // default used index - 2, // member count - ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value) - 15, - ACE_NTOHL (0x69707634), - ACE_NTOHL (0x5f656e64), - ACE_NTOHL (0x706f696e), - ACE_NTOHL (0x74730000), // name = ipv4_endpoints - CORBA::tk_struct, // typecode kind - 116, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f557369), - ACE_NTOHL (0x6e674970), - ACE_NTOHL (0x76343a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/MIOP/UsingIpv4:1.0 - 10, - ACE_NTOHL (0x5573696e), - ACE_NTOHL (0x67497076), - ACE_NTOHL (0x34000000), // name = UsingIpv4 - 2, // member count - 5, - ACE_NTOHL (0x706f7274), - ACE_NTOHL (0x0), // name = port - CORBA::tk_ushort, - - 16, - ACE_NTOHL (0x636c6173), - ACE_NTOHL (0x735f645f), - ACE_NTOHL (0x61646472), - ACE_NTOHL (0x65737300), // name = class_d_address - CORBA::tk_array, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, - - 4U, - - - ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value) - 15, - ACE_NTOHL (0x69707636), - ACE_NTOHL (0x5f656e64), - ACE_NTOHL (0x706f696e), - ACE_NTOHL (0x74730000), // name = ipv6_endpoints - CORBA::tk_struct, // typecode kind - 96, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f557369), - ACE_NTOHL (0x6e674970), - ACE_NTOHL (0x76363a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/MIOP/UsingIpv6:1.0 - 10, - ACE_NTOHL (0x5573696e), - ACE_NTOHL (0x67497076), - ACE_NTOHL (0x36000000), // name = UsingIpv6 - 2, // member count - 5, - ACE_NTOHL (0x706f7274), - ACE_NTOHL (0x0), // name = port - CORBA::tk_ulong, - - 8, - ACE_NTOHL (0x61646472), - ACE_NTOHL (0x65737300), // name = address - CORBA::tk_string, - 0U, // string length - -}; - -static CORBA::TypeCode _tc_TAO_tc_MIOP_IPEndpoints ( - CORBA::tk_union, - sizeof (_oc_MIOP_IPEndpoints), - (char *) &_oc_MIOP_IPEndpoints, +static CORBA::TypeCode _tc_TAO_tc_MIOP_Address ( + CORBA::tk_alias, + sizeof (_oc_MIOP_Address), + (char *) &_oc_MIOP_Address, 0, - sizeof (MIOP::IPEndpoints) + sizeof (MIOP::Address) ); TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (MIOP) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IPEndpoints, &_tc_TAO_tc_MIOP_IPEndpoints) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Address, &_tc_TAO_tc_MIOP_Address) TAO_NAMESPACE_END static const CORBA::Long _oc_MIOP_UIPMC_ProfileBody[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f554950), - ACE_NTOHL (0x4d435f50), - ACE_NTOHL (0x726f6669), - ACE_NTOHL (0x6c65426f), - ACE_NTOHL (0x64793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d494f50), + ACE_NTOHL (0x2f554950), + ACE_NTOHL (0x4d435f50), + ACE_NTOHL (0x726f6669), + ACE_NTOHL (0x6c65426f), + ACE_NTOHL (0x64793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/MIOP/UIPMC_ProfileBody:1.0 18, - ACE_NTOHL (0x5549504d), - ACE_NTOHL (0x435f5072), - ACE_NTOHL (0x6f66696c), - ACE_NTOHL (0x65426f64), + ACE_NTOHL (0x5549504d), + ACE_NTOHL (0x435f5072), + ACE_NTOHL (0x6f66696c), + ACE_NTOHL (0x65426f64), ACE_NTOHL (0x79000000), // name = UIPMC_ProfileBody - 3, // member count + 4, // member count 13, - ACE_NTOHL (0x6d696f70), - ACE_NTOHL (0x5f766572), - ACE_NTOHL (0x73696f6e), + ACE_NTOHL (0x6d696f70), + ACE_NTOHL (0x5f766572), + ACE_NTOHL (0x73696f6e), ACE_NTOHL (0x0), // name = miop_version - CORBA::tk_struct, // typecode kind - 88, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 148, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f566572), - ACE_NTOHL (0x73696f6e), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d494f50), + ACE_NTOHL (0x2f566572), + ACE_NTOHL (0x73696f6e), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/MIOP/Version:1.0 8, - ACE_NTOHL (0x56657273), + ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e00), // name = Version - 2, // member count - 6, - ACE_NTOHL (0x6d616a6f), - ACE_NTOHL (0x72000000), // name = major - CORBA::tk_octet, - - 6, - ACE_NTOHL (0x6d696e6f), - ACE_NTOHL (0x72000000), // name = minor - CORBA::tk_octet, - - - 10, - ACE_NTOHL (0x656e6470), - ACE_NTOHL (0x6f696e74), - ACE_NTOHL (0x73000000), // name = endpoints - CORBA::tk_union, // typecode kind - 348, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f495045), - ACE_NTOHL (0x6e64706f), - ACE_NTOHL (0x696e7473), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/MIOP/IPEndpoints:1.0 - 12, - ACE_NTOHL (0x4950456e), - ACE_NTOHL (0x64706f69), - ACE_NTOHL (0x6e747300), // name = IPEndpoints - CORBA::tk_short, - - -1, // default used index - 2, // member count - ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value) - 15, - ACE_NTOHL (0x69707634), - ACE_NTOHL (0x5f656e64), - ACE_NTOHL (0x706f696e), - ACE_NTOHL (0x74730000), // name = ipv4_endpoints CORBA::tk_struct, // typecode kind - 116, // encapsulation length + 88, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f557369), - ACE_NTOHL (0x6e674970), - ACE_NTOHL (0x76343a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/MIOP/UsingIpv4:1.0 - 10, - ACE_NTOHL (0x5573696e), - ACE_NTOHL (0x67497076), - ACE_NTOHL (0x34000000), // name = UsingIpv4 + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x47494f50), + ACE_NTOHL (0x2f566572), + ACE_NTOHL (0x73696f6e), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/GIOP/Version:1.0 + 8, + ACE_NTOHL (0x56657273), + ACE_NTOHL (0x696f6e00), // name = Version 2, // member count - 5, - ACE_NTOHL (0x706f7274), - ACE_NTOHL (0x0), // name = port - CORBA::tk_ushort, + 6, + ACE_NTOHL (0x6d616a6f), + ACE_NTOHL (0x72000000), // name = major + CORBA::tk_octet, - 16, - ACE_NTOHL (0x636c6173), - ACE_NTOHL (0x735f645f), - ACE_NTOHL (0x61646472), - ACE_NTOHL (0x65737300), // name = class_d_address - CORBA::tk_array, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 6, + ACE_NTOHL (0x6d696e6f), + ACE_NTOHL (0x72000000), // name = minor + CORBA::tk_octet, - 4U, - ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value) - 15, - ACE_NTOHL (0x69707636), - ACE_NTOHL (0x5f656e64), - ACE_NTOHL (0x706f696e), - ACE_NTOHL (0x74730000), // name = ipv6_endpoints - CORBA::tk_struct, // typecode kind - 96, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d494f50), - ACE_NTOHL (0x2f557369), - ACE_NTOHL (0x6e674970), - ACE_NTOHL (0x76363a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/MIOP/UsingIpv6:1.0 - 10, - ACE_NTOHL (0x5573696e), - ACE_NTOHL (0x67497076), - ACE_NTOHL (0x36000000), // name = UsingIpv6 - 2, // member count - 5, - ACE_NTOHL (0x706f7274), - ACE_NTOHL (0x0), // name = port - CORBA::tk_ulong, - - 8, - ACE_NTOHL (0x61646472), - ACE_NTOHL (0x65737300), // name = address - CORBA::tk_string, - 0U, // string length + 12, + ACE_NTOHL (0x7468655f), + ACE_NTOHL (0x61646472), + ACE_NTOHL (0x65737300), // name = the_address + CORBA::tk_alias, // typecode kind for typedefs + 60, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d494f50), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/MIOP/Address:1.0 + 8, + ACE_NTOHL (0x41646472), + ACE_NTOHL (0x65737300), // name = Address + CORBA::tk_string, + 0U, // string length + 9, + ACE_NTOHL (0x7468655f), + ACE_NTOHL (0x706f7274), + ACE_NTOHL (0x0), // name = the_port + CORBA::tk_short, 11, - ACE_NTOHL (0x636f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x636f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74730000), // name = components CORBA::tk_sequence, // typecode kind 200, // encapsulation length @@ -914,19 +493,19 @@ static const CORBA::Long _oc_MIOP_UIPMC_ProfileBody[] = 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 (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 (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400), // name = TaggedComponent 2, // member count 4, @@ -935,25 +514,25 @@ static const CORBA::Long _oc_MIOP_UIPMC_ProfileBody[] = 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 (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 (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400), // name = ComponentId CORBA::tk_ulong, 15, - ACE_NTOHL (0x636f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x745f6461), + ACE_NTOHL (0x636f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -988,7 +567,7 @@ void MIOP::UIPMC_ProfileBody::_tao_any_destructor (void *x) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CS_) #define __TAO_UNBOUNDED_SEQUENCE_MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CS_ @@ -997,43 +576,43 @@ void MIOP::UIPMC_ProfileBody::_tao_any_destructor (void *x) { IOP::TaggedComponent* tmp = 0; tmp = _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::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_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::freebuf (old); - + } this->buffer_ = tmp; } - + void MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_); - + _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::freebuf (tmp); this->buffer_ = 0; - } - + } + MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::~_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CS_) #define _MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CS_ @@ -1045,30 +624,30 @@ void MIOP::UIPMC_ProfileBody::_tao_any_destructor (void *x) MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent::_tao_seq_TaggedComponent (void) {} MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent::_tao_seq_TaggedComponent (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent::_tao_seq_TaggedComponent (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent::_tao_seq_TaggedComponent (const _tao_seq_TaggedComponent &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent::~_tao_seq_TaggedComponent (void) // dtor @@ -1173,7 +752,7 @@ MIOP::MulticastObjectGroupFactory_var::operator const ::MIOP::MulticastObjectGro return this->ptr_; } -MIOP::MulticastObjectGroupFactory_var::operator ::MIOP::MulticastObjectGroupFactory_ptr &() // cast +MIOP::MulticastObjectGroupFactory_var::operator ::MIOP::MulticastObjectGroupFactory_ptr &() // cast { return this->ptr_; } @@ -1365,7 +944,7 @@ void *MIOP::MulticastObjectGroupFactory::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1405,7 +984,7 @@ MIOP::MulticastObjectGroupFactory::ipaddr_free (MIOP::MulticastObjectGroupFactor delete [] _tao_slice; } -void +void MIOP::MulticastObjectGroupFactory::ipaddr_copy (MIOP::MulticastObjectGroupFactory::ipaddr_slice * _tao_to, const MIOP::MulticastObjectGroupFactory::ipaddr_slice *_tao_from) { // copy each individual element @@ -1457,13 +1036,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const MIOP::UniqueId *&_ ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (MIOP::_tc_UniqueId, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -1540,13 +1119,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const MIOP::PacketHeader ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (MIOP::_tc_PacketHeader_1_0, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -1587,358 +1166,6 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const MIOP::PacketHeader return 0; } -void operator<<= (CORBA::Any &_tao_any, const MIOP::Version &_tao_elem) // copying -{ - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - MIOP::_tc_Version, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -} - -void operator<<= (CORBA::Any &_tao_any, MIOP::Version *_tao_elem) // non copying -{ - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - MIOP::_tc_Version, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - MIOP::Version::_tao_any_destructor - ); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, MIOP::Version *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(const MIOP::Version*&,_tao_elem); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const MIOP::Version *&_tao_elem) -{ - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - - CORBA::Boolean result = type->equivalent (MIOP::_tc_Version, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) - return 0; // not equivalent - - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const MIOP::Version*, - _tao_any.value () - ); - return 1; - } - else - { - MIOP::Version *tmp; - ACE_NEW_RETURN (tmp, MIOP::Version, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - MIOP::_tc_Version, - 1, - ACE_static_cast (void *, tmp), - MIOP::Version::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; -} - -void operator<<= (CORBA::Any &_tao_any, const MIOP::UsingIpv4 &_tao_elem) // copying -{ - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - MIOP::_tc_UsingIpv4, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -} - -void operator<<= (CORBA::Any &_tao_any, MIOP::UsingIpv4 *_tao_elem) // non copying -{ - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - MIOP::_tc_UsingIpv4, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - MIOP::UsingIpv4::_tao_any_destructor - ); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, MIOP::UsingIpv4 *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(const MIOP::UsingIpv4*&,_tao_elem); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const MIOP::UsingIpv4 *&_tao_elem) -{ - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - - CORBA::Boolean result = type->equivalent (MIOP::_tc_UsingIpv4, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) - return 0; // not equivalent - - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const MIOP::UsingIpv4*, - _tao_any.value () - ); - return 1; - } - else - { - MIOP::UsingIpv4 *tmp; - ACE_NEW_RETURN (tmp, MIOP::UsingIpv4, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - MIOP::_tc_UsingIpv4, - 1, - ACE_static_cast (void *, tmp), - MIOP::UsingIpv4::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; -} - -void operator<<= (CORBA::Any &_tao_any, const MIOP::UsingIpv6 &_tao_elem) // copying -{ - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - MIOP::_tc_UsingIpv6, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -} - -void operator<<= (CORBA::Any &_tao_any, MIOP::UsingIpv6 *_tao_elem) // non copying -{ - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - MIOP::_tc_UsingIpv6, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - MIOP::UsingIpv6::_tao_any_destructor - ); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, MIOP::UsingIpv6 *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(const MIOP::UsingIpv6*&,_tao_elem); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const MIOP::UsingIpv6 *&_tao_elem) -{ - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - - CORBA::Boolean result = type->equivalent (MIOP::_tc_UsingIpv6, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) - return 0; // not equivalent - - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const MIOP::UsingIpv6*, - _tao_any.value () - ); - return 1; - } - else - { - MIOP::UsingIpv6 *tmp; - ACE_NEW_RETURN (tmp, MIOP::UsingIpv6, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - MIOP::_tc_UsingIpv6, - 1, - ACE_static_cast (void *, tmp), - MIOP::UsingIpv6::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; -} - -void operator<<= ( - CORBA::Any &_tao_any, - const MIOP::IPEndpoints &_tao_elem - ) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - MIOP::_tc_IPEndpoints, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void operator<<= ( - CORBA::Any &_tao_any, - MIOP::IPEndpoints *_tao_elem - ) -{ - TAO_OutputCDR stream; - if (stream << *_tao_elem) - { - _tao_any._tao_replace ( - MIOP::_tc_IPEndpoints, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - MIOP::IPEndpoints::_tao_any_destructor - ); - } -} - -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - MIOP::IPEndpoints *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast( - const MIOP::IPEndpoints*&, - _tao_elem - ); -} - -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const MIOP::IPEndpoints *&_tao_elem - ) -{ - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - - CORBA::Boolean result = type->equivalent (MIOP::_tc_IPEndpoints, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) - return 0; // not equivalent - - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const MIOP::IPEndpoints*, - _tao_any.value () - ); - return 1; - } - else - { - MIOP::IPEndpoints *tmp; - ACE_NEW_RETURN (tmp, MIOP::IPEndpoints, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - MIOP::_tc_IPEndpoints, - 1, - ACE_static_cast (void *, tmp), - MIOP::IPEndpoints::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; -} - void operator<<= (CORBA::Any &_tao_any, const MIOP::UIPMC_ProfileBody &_tao_elem) // copying { TAO_OutputCDR stream; @@ -1975,13 +1202,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const MIOP::UIPMC_Profil ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (MIOP::_tc_UIPMC_ProfileBody, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2055,7 +1282,7 @@ 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) + if (0 >= _tao_seq_len) return 1; // Add a check to the length of the sequence // to make sure it does not exceed the length @@ -2102,7 +1329,7 @@ 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) + if (0 >= _tao_seq_len) return 1; // Add a check to the length of the sequence // to make sure it does not exceed the length diff --git a/TAO/tao/PortableGroup/miopC.h b/TAO/tao/PortableGroup/miopC.h index 7a4564d495d..25d280b4d69 100644 --- a/TAO/tao/PortableGroup/miopC.h +++ b/TAO/tao/PortableGroup/miopC.h @@ -30,7 +30,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "tao/IOPC.h" +//#include "IOPC.h" +#include "tao/GIOPC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -59,7 +60,7 @@ TAO_NAMESPACE MIOP { #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_BOUNDED_SEQUENCE_MIOP_UNIQUEID_252_CH_) #define __TAO_BOUNDED_SEQUENCE_MIOP_UNIQUEID_252_CH_ @@ -67,7 +68,7 @@ TAO_NAMESPACE MIOP { public: // = Initialization and termination methods. - + _TAO_Bounded_Sequence_MIOP_UniqueId_252 (void); _TAO_Bounded_Sequence_MIOP_UniqueId_252 (CORBA::ULong length, CORBA::Octet *data, @@ -75,7 +76,7 @@ TAO_NAMESPACE MIOP _TAO_Bounded_Sequence_MIOP_UniqueId_252 (const _TAO_Bounded_Sequence_MIOP_UniqueId_252 &rhs); // Copy constructor. _TAO_Bounded_Sequence_MIOP_UniqueId_252 &operator= (const _TAO_Bounded_Sequence_MIOP_UniqueId_252 &rhs); - // Assignment operator. + // Assignment operator. virtual ~_TAO_Bounded_Sequence_MIOP_UniqueId_252 (void); // Dtor. // = Accessors. CORBA::Octet &operator[] (CORBA::ULong i);// operator [] @@ -96,30 +97,30 @@ TAO_NAMESPACE MIOP #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_MIOP_UNIQUEID_CH_) #define _MIOP_UNIQUEID_CH_ class UniqueId; class UniqueId_var; - + // ************************************************************* // UniqueId // ************************************************************* - - class TAO_PortableGroup_Export UniqueId : public + + class TAO_PortableGroup_Export UniqueId : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Bounded_Sequence_MIOP_UniqueId_252 #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Bounded_Sequence<CORBA::Octet, 252U> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: UniqueId (void); // default ctor UniqueId ( - CORBA::ULong length, - CORBA::Octet *buffer, + CORBA::ULong length, + CORBA::Octet *buffer, CORBA::Boolean release = 0 ); UniqueId (const UniqueId &); // copy ctor @@ -131,7 +132,7 @@ TAO_NAMESPACE MIOP #endif /* ! __GNUC__ || g++ >= 2.8 */ }; - + #endif /* end #if !defined */ @@ -150,21 +151,21 @@ TAO_NAMESPACE MIOP UniqueId_var (const UniqueId_var &); // copy constructor UniqueId_var (const UniqueId &); // fixed-size base types only ~UniqueId_var (void); // destructor - + UniqueId_var &operator= (UniqueId *); UniqueId_var &operator= (const UniqueId_var &); UniqueId_var &operator= (const UniqueId &); // fixed-size base types only UniqueId *operator-> (void); const UniqueId *operator-> (void) const; - + operator const UniqueId &() const; operator UniqueId &(); operator UniqueId &() const; - + CORBA::Octet & operator[] (CORBA::ULong index); const CORBA::Octet & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const UniqueId &in (void) const; UniqueId &inout (void); UniqueId *&out (void); @@ -194,7 +195,7 @@ TAO_NAMESPACE MIOP UniqueId *&ptr (void); UniqueId *operator-> (void); CORBA::Octet & operator[] (CORBA::ULong index); - + private: UniqueId *&ptr_; // assignment from T_var not allowed @@ -208,7 +209,7 @@ TAO_NAMESPACE MIOP struct PacketHeader_1_0; class PacketHeader_1_0_var; - + struct TAO_PortableGroup_Export PacketHeader_1_0 { @@ -234,12 +235,12 @@ TAO_NAMESPACE MIOP static void _tao_any_destructor (void*); _magic_forany &operator= (_magic_slice *); _magic_forany &operator= (const _magic_forany &); - + _magic_slice &operator[] (CORBA::ULong index); const _magic_slice &operator[] (CORBA::ULong index) const; operator _magic_slice * const &() const; operator _magic_slice *&(); - // in, inout, out, _retn + // in, inout, out, _retn const _magic_slice *in (void) const; _magic_slice *inout (void); _magic_slice *&out (void); @@ -256,7 +257,7 @@ TAO_NAMESPACE MIOP static void _magic_free (_magic_slice *_tao_slice); static _magic_slice *_magic_dup (const _magic_slice *_tao_slice); static void _magic_copy (_magic_slice *_tao_to, const _magic_slice *_tao_from); - + #endif /* end #if !defined */ @@ -276,18 +277,18 @@ TAO_NAMESPACE MIOP PacketHeader_1_0_var (PacketHeader_1_0 *); PacketHeader_1_0_var (const PacketHeader_1_0_var &); // copy constructor ~PacketHeader_1_0_var (void); // destructor - + PacketHeader_1_0_var &operator= (PacketHeader_1_0 *); PacketHeader_1_0_var &operator= (const PacketHeader_1_0_var &); PacketHeader_1_0 *operator-> (void); const PacketHeader_1_0 *operator-> (void) const; - + operator const PacketHeader_1_0 &() const; operator PacketHeader_1_0 &(); operator PacketHeader_1_0 &() const; operator PacketHeader_1_0 *&(); // variable-size types only - - // in, inout, out, _retn + + // in, inout, out, _retn const PacketHeader_1_0 &in (void) const; PacketHeader_1_0 &inout (void); PacketHeader_1_0 *&out (void); @@ -309,7 +310,7 @@ TAO_NAMESPACE MIOP operator PacketHeader_1_0 *&(); PacketHeader_1_0 *&ptr (void); PacketHeader_1_0 *operator-> (void); - + private: PacketHeader_1_0 *&ptr_; // assignment from T_var not allowed @@ -318,535 +319,220 @@ TAO_NAMESPACE MIOP TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PacketHeader_1_0; - struct Version; - class Version_var; - - struct TAO_PortableGroup_Export Version - { - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef Version_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static void _tao_any_destructor (void*); - - CORBA::Octet major; - CORBA::Octet minor; - }; - - class TAO_PortableGroup_Export Version_var - { - public: - Version_var (void); // default constructor - Version_var (Version *); - Version_var (const Version_var &); // copy constructor - Version_var (const Version &); // fixed-size types only - ~Version_var (void); // destructor - - Version_var &operator= (Version *); - Version_var &operator= (const Version_var &); - Version_var &operator= (const Version &); // fixed-size types only - Version *operator-> (void); - const Version *operator-> (void) const; - - operator const Version &() const; - operator Version &(); - operator Version &() const; - - // in, inout, out, _retn - const Version &in (void) const; - Version &inout (void); - Version &out (void); - Version _retn (void); - Version *ptr (void) const; - - private: - Version *ptr_; - }; - - typedef Version &Version_out; - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Version; - - typedef CORBA::Short IPVersion; - typedef CORBA::Short_out IPVersion_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IPVersion; - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short IPv4; - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short IPv6; - - struct UsingIpv4; - class UsingIpv4_var; - - struct TAO_PortableGroup_Export UsingIpv4 - { - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef UsingIpv4_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static void _tao_any_destructor (void*); - - CORBA::UShort port; - -#if !defined (_MIOP_USINGIPV4_CLASS_D_ADDRESS_CH_) -#define _MIOP_USINGIPV4_CLASS_D_ADDRESS_CH_ - - typedef CORBA::Octet _class_d_address[4]; - typedef CORBA::Octet _class_d_address_slice; - class TAO_PortableGroup_Export _class_d_address_forany - { - public: - _class_d_address_forany (void); // default constructor - _class_d_address_forany (_class_d_address_slice *, CORBA::Boolean nocopy=0); - _class_d_address_forany (const _class_d_address_forany &); // copy constructor - ~_class_d_address_forany (void); // destructor - static void _tao_any_destructor (void*); - _class_d_address_forany &operator= (_class_d_address_slice *); - _class_d_address_forany &operator= (const _class_d_address_forany &); - - _class_d_address_slice &operator[] (CORBA::ULong index); - const _class_d_address_slice &operator[] (CORBA::ULong index) const; - operator _class_d_address_slice * const &() const; - operator _class_d_address_slice *&(); - // in, inout, out, _retn - const _class_d_address_slice *in (void) const; - _class_d_address_slice *inout (void); - _class_d_address_slice *&out (void); - _class_d_address_slice *_retn (void); - _class_d_address_slice *ptr (void) const; - CORBA::Boolean nocopy (void) const; - private: - /* friend class CORBA_Any; */ - _class_d_address_slice *ptr_; - CORBA::Boolean nocopy_; - }; - - static _class_d_address_slice *_class_d_address_alloc (void); - static void _class_d_address_free (_class_d_address_slice *_tao_slice); - static _class_d_address_slice *_class_d_address_dup (const _class_d_address_slice *_tao_slice); - static void _class_d_address_copy (_class_d_address_slice *_tao_to, const _class_d_address_slice *_tao_from); + typedef GIOP::Version Version; +// @@ Frank: Version_var and Version_out are commented out as they +// do not exist in tao/GIOPC.h. Hopefully, this doesn't become an +// issue. +// typedef GIOP::Version_var Version_var; +// typedef GIOP::Version_out Version_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Version; -#endif /* end #if !defined */ - - _class_d_address class_d_address; - }; + typedef char * Address; + typedef CORBA::String_var Address_var; + typedef CORBA::String_out Address_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address; - class TAO_PortableGroup_Export UsingIpv4_var - { - public: - UsingIpv4_var (void); // default constructor - UsingIpv4_var (UsingIpv4 *); - UsingIpv4_var (const UsingIpv4_var &); // copy constructor - UsingIpv4_var (const UsingIpv4 &); // fixed-size types only - ~UsingIpv4_var (void); // destructor - - UsingIpv4_var &operator= (UsingIpv4 *); - UsingIpv4_var &operator= (const UsingIpv4_var &); - UsingIpv4_var &operator= (const UsingIpv4 &); // fixed-size types only - UsingIpv4 *operator-> (void); - const UsingIpv4 *operator-> (void) const; - - operator const UsingIpv4 &() const; - operator UsingIpv4 &(); - operator UsingIpv4 &() const; - - // in, inout, out, _retn - const UsingIpv4 &in (void) const; - UsingIpv4 &inout (void); - UsingIpv4 &out (void); - UsingIpv4 _retn (void); - UsingIpv4 *ptr (void) const; - - private: - UsingIpv4 *ptr_; - }; - - typedef UsingIpv4 &UsingIpv4_out; - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsingIpv4; - - struct UsingIpv6; - class UsingIpv6_var; - - struct TAO_PortableGroup_Export UsingIpv6 + struct UIPMC_ProfileBody; + class UIPMC_ProfileBody_var; + + struct TAO_PortableGroup_Export UIPMC_ProfileBody { #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef UsingIpv6_var _var_type; + typedef UIPMC_ProfileBody_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ static void _tao_any_destructor (void*); - CORBA::ULong port; - TAO_String_Manager address; - }; - - class TAO_PortableGroup_Export UsingIpv6_var - { - public: - UsingIpv6_var (void); // default constructor - UsingIpv6_var (UsingIpv6 *); - UsingIpv6_var (const UsingIpv6_var &); // copy constructor - ~UsingIpv6_var (void); // destructor - - UsingIpv6_var &operator= (UsingIpv6 *); - UsingIpv6_var &operator= (const UsingIpv6_var &); - UsingIpv6 *operator-> (void); - const UsingIpv6 *operator-> (void) const; - - operator const UsingIpv6 &() const; - operator UsingIpv6 &(); - operator UsingIpv6 &() const; - operator UsingIpv6 *&(); // variable-size types only - - // in, inout, out, _retn - const UsingIpv6 &in (void) const; - UsingIpv6 &inout (void); - UsingIpv6 *&out (void); - UsingIpv6 *_retn (void); - UsingIpv6 *ptr (void) const; - - private: - UsingIpv6 *ptr_; - }; - - class TAO_PortableGroup_Export UsingIpv6_out - { - public: - UsingIpv6_out (UsingIpv6 *&); - UsingIpv6_out (UsingIpv6_var &); - UsingIpv6_out (const UsingIpv6_out &); - UsingIpv6_out &operator= (const UsingIpv6_out &); - UsingIpv6_out &operator= (UsingIpv6 *); - operator UsingIpv6 *&(); - UsingIpv6 *&ptr (void); - UsingIpv6 *operator-> (void); - - private: - UsingIpv6 *&ptr_; - // assignment from T_var not allowed - void operator= (const UsingIpv6_var &); - }; - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsingIpv6; - - -#if !defined (_MIOP_IPENDPOINTS_CH_) -#define _MIOP_IPENDPOINTS_CH_ - - class IPEndpoints; - class IPEndpoints_var; - - class TAO_PortableGroup_Export IPEndpoints - { - public: - IPEndpoints (void); - IPEndpoints (const IPEndpoints &); - ~IPEndpoints (void); - static void _tao_any_destructor (void*); - - IPEndpoints &operator= (const IPEndpoints &); - - void _d (CORBA::Short); - CORBA::Short _d (void) const; - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef IPEndpoints_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - void ipv4_endpoints (const ACE_NESTED_CLASS (MIOP, UsingIpv4) &);// set - const ACE_NESTED_CLASS (MIOP, UsingIpv4) &ipv4_endpoints (void) const; // get method (read only) - ACE_NESTED_CLASS (MIOP, UsingIpv4) &ipv4_endpoints (void); // get method (read/write only) - - void ipv6_endpoints (const ACE_NESTED_CLASS (MIOP, UsingIpv6) &);// set - const ACE_NESTED_CLASS (MIOP, UsingIpv6) &ipv6_endpoints (void) const; // get method (read only) - ACE_NESTED_CLASS (MIOP, UsingIpv6) &ipv6_endpoints (void); // get method (read/write only) - - void _default (); - private: - CORBA::Short disc_; - CORBA::Short holder_; - union - { - ACE_NESTED_CLASS (MIOP, UsingIpv4) ipv4_endpoints_; - ACE_NESTED_CLASS (MIOP, UsingIpv6) *ipv6_endpoints_; - } u_; // end of union - // TAO extensions - void _reset (CORBA::Short, CORBA::Boolean); - // Frees any allocated storage - - void _reset (void); - // calls the above reset with finalize=1 - - }; // MIOP::IPEndpoints - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IPEndpoints; - - -#endif /* end #if !defined */ - - -#if !defined (_MIOP_IPENDPOINTS___VAR_CH_) -#define _MIOP_IPENDPOINTS___VAR_CH_ - - class TAO_PortableGroup_Export IPEndpoints_var - { - public: - IPEndpoints_var (void); // default constructor - IPEndpoints_var (IPEndpoints *); - IPEndpoints_var (const IPEndpoints_var &); // copy constructor - ~IPEndpoints_var (void); // destructor - - IPEndpoints_var &operator= (IPEndpoints *); - IPEndpoints_var &operator= (const IPEndpoints_var &); - IPEndpoints *operator-> (void); - const IPEndpoints *operator-> (void) const; - - operator const IPEndpoints &() const; - operator IPEndpoints &(); - operator IPEndpoints &() const; - operator IPEndpoints *&(); // variable-size types only - - // in, inout, out, _retn - const IPEndpoints &in (void) const; - IPEndpoints &inout (void); - IPEndpoints *&out (void); - IPEndpoints *_retn (void); - IPEndpoints *ptr(void) const; - - private: - IPEndpoints *ptr_; - }; - - -#endif /* end #if !defined */ - - -#if !defined (_MIOP_IPENDPOINTS___OUT_CH_) -#define _MIOP_IPENDPOINTS___OUT_CH_ - - class TAO_PortableGroup_Export IPEndpoints_out - { - public: - IPEndpoints_out (IPEndpoints *&); - IPEndpoints_out (IPEndpoints_var &); - IPEndpoints_out (const IPEndpoints_out &); - IPEndpoints_out &operator= (const IPEndpoints_out &); - IPEndpoints_out &operator= (IPEndpoints *); - operator IPEndpoints *&(); - IPEndpoints *&ptr (void); - IPEndpoints *operator-> (void); - - private: - IPEndpoints *&ptr_; - // assignment from T_var not allowed - void operator= (const IPEndpoints_var &); - }; - - -#endif /* end #if !defined */ - - struct UIPMC_ProfileBody; - class UIPMC_ProfileBody_var; - - struct TAO_PortableGroup_Export UIPMC_ProfileBody - { - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef UIPMC_ProfileBody_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static void _tao_any_destructor (void*); - - ACE_NESTED_CLASS (MIOP, Version) miop_version; - ACE_NESTED_CLASS (MIOP, IPEndpoints) endpoints; + ACE_NESTED_CLASS (MIOP, Version) miop_version; + TAO_String_Manager the_address; + CORBA::Short the_port; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CH_) #define __TAO_UNBOUNDED_SEQUENCE_MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CH_ - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (void); // Default constructor. - _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (const _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent &rhs); - _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent &operator= (const _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent &rhs); - virtual ~_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (void); // Dtor. - // = Accessors. - IOP::TaggedComponent &operator[] (CORBA::ULong i); - const IOP::TaggedComponent &operator[] (CORBA::ULong i) const; - // = Static operations. - static IOP::TaggedComponent *allocbuf (CORBA::ULong size); - static void freebuf (IOP::TaggedComponent *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - IOP::TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); - const IOP::TaggedComponent *get_buffer (void) const; - void replace (CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release); - }; + class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + + _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (void); // Default constructor. + _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (CORBA::ULong maximum, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release = 0); + _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (const _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent &rhs); + _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent &operator= (const _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent &rhs); + virtual ~_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (void); // Dtor. + // = Accessors. + IOP::TaggedComponent &operator[] (CORBA::ULong i); + const IOP::TaggedComponent &operator[] (CORBA::ULong i) const; + // = Static operations. + static IOP::TaggedComponent *allocbuf (CORBA::ULong size); + static void freebuf (IOP::TaggedComponent *buffer); + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + IOP::TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); + const IOP::TaggedComponent *get_buffer (void) const; + void replace (CORBA::ULong max, + CORBA::ULong length, + IOP::TaggedComponent *data, + CORBA::Boolean release); + }; #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CH_) #define _MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CH_ - class _tao_seq_TaggedComponent; - class _tao_seq_TaggedComponent_var; - - // ************************************************************* - // _tao_seq_TaggedComponent - // ************************************************************* - - class TAO_PortableGroup_Export _tao_seq_TaggedComponent : public + class _tao_seq_TaggedComponent; + class _tao_seq_TaggedComponent_var; + + // ************************************************************* + // _tao_seq_TaggedComponent + // ************************************************************* + + class TAO_PortableGroup_Export _tao_seq_TaggedComponent : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent + _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<IOP::TaggedComponent> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - _tao_seq_TaggedComponent (void); // default ctor - _tao_seq_TaggedComponent (CORBA::ULong max); // uses max size - _tao_seq_TaggedComponent ( - CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedComponent *buffer, - CORBA::Boolean release = 0 - ); - _tao_seq_TaggedComponent (const _tao_seq_TaggedComponent &); // copy ctor - ~_tao_seq_TaggedComponent (void); - static void _tao_any_destructor (void*); + TAO_Unbounded_Sequence<IOP::TaggedComponent> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + _tao_seq_TaggedComponent (void); // default ctor + _tao_seq_TaggedComponent (CORBA::ULong max); // uses max size + _tao_seq_TaggedComponent ( + CORBA::ULong max, + CORBA::ULong length, + IOP::TaggedComponent *buffer, + CORBA::Boolean release = 0 + ); + _tao_seq_TaggedComponent (const _tao_seq_TaggedComponent &); // copy ctor + ~_tao_seq_TaggedComponent (void); + static void _tao_any_destructor (void*); #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_TaggedComponent_var _var_type; + typedef _tao_seq_TaggedComponent_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - }; - + }; + #endif /* end #if !defined */ #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_TaggedComponent _components_seq; - #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + typedef _tao_seq_TaggedComponent _components_seq; + #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ - _tao_seq_TaggedComponent components; - }; - - class TAO_PortableGroup_Export UIPMC_ProfileBody_var - { - public: - UIPMC_ProfileBody_var (void); // default constructor - UIPMC_ProfileBody_var (UIPMC_ProfileBody *); - UIPMC_ProfileBody_var (const UIPMC_ProfileBody_var &); // copy constructor - ~UIPMC_ProfileBody_var (void); // destructor - - UIPMC_ProfileBody_var &operator= (UIPMC_ProfileBody *); - UIPMC_ProfileBody_var &operator= (const UIPMC_ProfileBody_var &); - UIPMC_ProfileBody *operator-> (void); - const UIPMC_ProfileBody *operator-> (void) const; - - operator const UIPMC_ProfileBody &() const; - operator UIPMC_ProfileBody &(); - operator UIPMC_ProfileBody &() const; - operator UIPMC_ProfileBody *&(); // variable-size types only - - // in, inout, out, _retn - const UIPMC_ProfileBody &in (void) const; - UIPMC_ProfileBody &inout (void); - UIPMC_ProfileBody *&out (void); - UIPMC_ProfileBody *_retn (void); - UIPMC_ProfileBody *ptr (void) const; + _tao_seq_TaggedComponent components; + }; - private: - UIPMC_ProfileBody *ptr_; - }; + class TAO_PortableGroup_Export UIPMC_ProfileBody_var + { + public: + UIPMC_ProfileBody_var (void); // default constructor + UIPMC_ProfileBody_var (UIPMC_ProfileBody *); + UIPMC_ProfileBody_var (const UIPMC_ProfileBody_var &); // copy constructor + ~UIPMC_ProfileBody_var (void); // destructor + + UIPMC_ProfileBody_var &operator= (UIPMC_ProfileBody *); + UIPMC_ProfileBody_var &operator= (const UIPMC_ProfileBody_var &); + UIPMC_ProfileBody *operator-> (void); + const UIPMC_ProfileBody *operator-> (void) const; + + operator const UIPMC_ProfileBody &() const; + operator UIPMC_ProfileBody &(); + operator UIPMC_ProfileBody &() const; + operator UIPMC_ProfileBody *&(); // variable-size types only + + // in, inout, out, _retn + const UIPMC_ProfileBody &in (void) const; + UIPMC_ProfileBody &inout (void); + UIPMC_ProfileBody *&out (void); + UIPMC_ProfileBody *_retn (void); + UIPMC_ProfileBody *ptr (void) const; - class TAO_PortableGroup_Export UIPMC_ProfileBody_out - { - public: - UIPMC_ProfileBody_out (UIPMC_ProfileBody *&); - UIPMC_ProfileBody_out (UIPMC_ProfileBody_var &); - UIPMC_ProfileBody_out (const UIPMC_ProfileBody_out &); - UIPMC_ProfileBody_out &operator= (const UIPMC_ProfileBody_out &); - UIPMC_ProfileBody_out &operator= (UIPMC_ProfileBody *); - operator UIPMC_ProfileBody *&(); - UIPMC_ProfileBody *&ptr (void); - UIPMC_ProfileBody *operator-> (void); + private: + UIPMC_ProfileBody *ptr_; + }; - private: - UIPMC_ProfileBody *&ptr_; - // assignment from T_var not allowed - void operator= (const UIPMC_ProfileBody_var &); - }; + class TAO_PortableGroup_Export UIPMC_ProfileBody_out + { + public: + UIPMC_ProfileBody_out (UIPMC_ProfileBody *&); + UIPMC_ProfileBody_out (UIPMC_ProfileBody_var &); + UIPMC_ProfileBody_out (const UIPMC_ProfileBody_out &); + UIPMC_ProfileBody_out &operator= (const UIPMC_ProfileBody_out &); + UIPMC_ProfileBody_out &operator= (UIPMC_ProfileBody *); + operator UIPMC_ProfileBody *&(); + UIPMC_ProfileBody *&ptr (void); + UIPMC_ProfileBody *operator-> (void); + + private: + UIPMC_ProfileBody *&ptr_; + // assignment from T_var not allowed + void operator= (const UIPMC_ProfileBody_var &); + }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UIPMC_ProfileBody; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UIPMC_ProfileBody; #if !defined (_MIOP_MULTICASTOBJECTGROUPFACTORY___PTR_CH_) #define _MIOP_MULTICASTOBJECTGROUPFACTORY___PTR_CH_ - class MulticastObjectGroupFactory; - typedef MulticastObjectGroupFactory *MulticastObjectGroupFactory_ptr; - + class MulticastObjectGroupFactory; + typedef MulticastObjectGroupFactory *MulticastObjectGroupFactory_ptr; + #endif /* end #if !defined */ #if !defined (_MIOP_MULTICASTOBJECTGROUPFACTORY___VAR_CH_) #define _MIOP_MULTICASTOBJECTGROUPFACTORY___VAR_CH_ - class TAO_PortableGroup_Export MulticastObjectGroupFactory_var : public TAO_Base_var - { - public: - MulticastObjectGroupFactory_var (void); // default constructor - MulticastObjectGroupFactory_var (MulticastObjectGroupFactory_ptr p) : ptr_ (p) {} - MulticastObjectGroupFactory_var (const MulticastObjectGroupFactory_var &); // copy constructor - ~MulticastObjectGroupFactory_var (void); // destructor - - MulticastObjectGroupFactory_var &operator= (MulticastObjectGroupFactory_ptr); - MulticastObjectGroupFactory_var &operator= (const MulticastObjectGroupFactory_var &); - MulticastObjectGroupFactory_ptr operator-> (void) const; - - operator const MulticastObjectGroupFactory_ptr &() const; - operator MulticastObjectGroupFactory_ptr &(); - // in, inout, out, _retn - MulticastObjectGroupFactory_ptr in (void) const; - MulticastObjectGroupFactory_ptr &inout (void); - MulticastObjectGroupFactory_ptr &out (void); - MulticastObjectGroupFactory_ptr _retn (void); - MulticastObjectGroupFactory_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static MulticastObjectGroupFactory_ptr duplicate (MulticastObjectGroupFactory_ptr); - static void release (MulticastObjectGroupFactory_ptr); - static MulticastObjectGroupFactory_ptr nil (void); - static MulticastObjectGroupFactory_ptr narrow (CORBA::Object *, CORBA::Environment &); - static CORBA::Object * upcast (void *); - - private: - MulticastObjectGroupFactory_ptr ptr_; - // Unimplemented - prevents widening assignment. - MulticastObjectGroupFactory_var (const TAO_Base_var &rhs); - MulticastObjectGroupFactory_var &operator= (const TAO_Base_var &rhs); - }; + class TAO_PortableGroup_Export MulticastObjectGroupFactory_var : public TAO_Base_var + { + public: + MulticastObjectGroupFactory_var (void); // default constructor + MulticastObjectGroupFactory_var (MulticastObjectGroupFactory_ptr p) : ptr_ (p) {} + MulticastObjectGroupFactory_var (const MulticastObjectGroupFactory_var &); // copy constructor + ~MulticastObjectGroupFactory_var (void); // destructor + + MulticastObjectGroupFactory_var &operator= (MulticastObjectGroupFactory_ptr); + MulticastObjectGroupFactory_var &operator= (const MulticastObjectGroupFactory_var &); + MulticastObjectGroupFactory_ptr operator-> (void) const; + + operator const MulticastObjectGroupFactory_ptr &() const; + operator MulticastObjectGroupFactory_ptr &(); + // in, inout, out, _retn + MulticastObjectGroupFactory_ptr in (void) const; + MulticastObjectGroupFactory_ptr &inout (void); + MulticastObjectGroupFactory_ptr &out (void); + MulticastObjectGroupFactory_ptr _retn (void); + MulticastObjectGroupFactory_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static MulticastObjectGroupFactory_ptr duplicate (MulticastObjectGroupFactory_ptr); + static void release (MulticastObjectGroupFactory_ptr); + static MulticastObjectGroupFactory_ptr nil (void); + static MulticastObjectGroupFactory_ptr narrow (CORBA::Object *, CORBA::Environment &); + static CORBA::Object * upcast (void *); + + private: + MulticastObjectGroupFactory_ptr ptr_; + // Unimplemented - prevents widening assignment. + MulticastObjectGroupFactory_var (const TAO_Base_var &rhs); + MulticastObjectGroupFactory_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ @@ -855,22 +541,22 @@ TAO_NAMESPACE MIOP #if !defined (_MIOP_MULTICASTOBJECTGROUPFACTORY___OUT_CH_) #define _MIOP_MULTICASTOBJECTGROUPFACTORY___OUT_CH_ - class TAO_PortableGroup_Export MulticastObjectGroupFactory_out - { - public: - MulticastObjectGroupFactory_out (MulticastObjectGroupFactory_ptr &); - MulticastObjectGroupFactory_out (MulticastObjectGroupFactory_var &); - MulticastObjectGroupFactory_out (const MulticastObjectGroupFactory_out &); - MulticastObjectGroupFactory_out &operator= (const MulticastObjectGroupFactory_out &); - MulticastObjectGroupFactory_out &operator= (const MulticastObjectGroupFactory_var &); - MulticastObjectGroupFactory_out &operator= (MulticastObjectGroupFactory_ptr); - operator MulticastObjectGroupFactory_ptr &(); - MulticastObjectGroupFactory_ptr &ptr (void); - MulticastObjectGroupFactory_ptr operator-> (void); - - private: - MulticastObjectGroupFactory_ptr &ptr_; - }; + class TAO_PortableGroup_Export MulticastObjectGroupFactory_out + { + public: + MulticastObjectGroupFactory_out (MulticastObjectGroupFactory_ptr &); + MulticastObjectGroupFactory_out (MulticastObjectGroupFactory_var &); + MulticastObjectGroupFactory_out (const MulticastObjectGroupFactory_out &); + MulticastObjectGroupFactory_out &operator= (const MulticastObjectGroupFactory_out &); + MulticastObjectGroupFactory_out &operator= (const MulticastObjectGroupFactory_var &); + MulticastObjectGroupFactory_out &operator= (MulticastObjectGroupFactory_ptr); + operator MulticastObjectGroupFactory_ptr &(); + MulticastObjectGroupFactory_ptr &ptr (void); + MulticastObjectGroupFactory_ptr operator-> (void); + + private: + MulticastObjectGroupFactory_ptr &ptr_; + }; #endif /* end #if !defined */ @@ -879,210 +565,184 @@ TAO_NAMESPACE MIOP #if !defined (_MIOP_MULTICASTOBJECTGROUPFACTORY_CH_) #define _MIOP_MULTICASTOBJECTGROUPFACTORY_CH_ - class TAO_PortableGroup_Export MulticastObjectGroupFactory : public virtual CORBA_Object - { - public: - #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef MulticastObjectGroupFactory_ptr _ptr_type; - typedef MulticastObjectGroupFactory_var _var_type; - #endif /* ! __GNUC__ || g++ >= 2.8 */ - - // the static operations - static MulticastObjectGroupFactory_ptr _duplicate (MulticastObjectGroupFactory_ptr obj); - static MulticastObjectGroupFactory_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - static MulticastObjectGroupFactory_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - static MulticastObjectGroupFactory_ptr _nil (void) - { - return (MulticastObjectGroupFactory_ptr)0; - } + class TAO_PortableGroup_Export MulticastObjectGroupFactory : public virtual CORBA_Object + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef MulticastObjectGroupFactory_ptr _ptr_type; + typedef MulticastObjectGroupFactory_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + // the static operations + static MulticastObjectGroupFactory_ptr _duplicate (MulticastObjectGroupFactory_ptr obj); + static MulticastObjectGroupFactory_ptr _narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static MulticastObjectGroupFactory_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static MulticastObjectGroupFactory_ptr _nil (void) + { + return (MulticastObjectGroupFactory_ptr)0; + } #if !defined (_MIOP_MULTICASTOBJECTGROUPFACTORY_IPADDR_CH_) #define _MIOP_MULTICASTOBJECTGROUPFACTORY_IPADDR_CH_ - typedef CORBA::Octet ipaddr[4]; - typedef CORBA::Octet ipaddr_slice; - class TAO_PortableGroup_Export ipaddr_var - { - public: - ipaddr_var (void); // default constructor - ipaddr_var (ipaddr_slice *); - ipaddr_var (const ipaddr_var &); // copy constructor - ~ipaddr_var (void); // destructor - - ipaddr_var &operator= (ipaddr_slice *); - ipaddr_var &operator= (const ipaddr_var &); - - ipaddr_slice &operator[] (CORBA::ULong index); - const ipaddr_slice &operator[] (CORBA::ULong index) const; - operator ipaddr_slice * const &() const; - //Calls ipaddr_copy (used in sequences of ipaddr). - static void copy (ipaddr_slice *_tao_to, const ipaddr_slice *_tao_from); - // in, inout, out, _retn - const ipaddr_slice *in (void) const; - ipaddr_slice *inout (void); - ipaddr_slice *&out (void); - ipaddr_slice *_retn (void); - ipaddr_slice *ptr (void) const; - private: - ipaddr_slice *ptr_; - }; - - typedef ipaddr ipaddr_out; - class TAO_PortableGroup_Export ipaddr_forany - { - public: - ipaddr_forany (void); // default constructor - ipaddr_forany (ipaddr_slice *, CORBA::Boolean nocopy=0); - ipaddr_forany (const ipaddr_forany &); // copy constructor - ~ipaddr_forany (void); // destructor - static void _tao_any_destructor (void*); - ipaddr_forany &operator= (ipaddr_slice *); - ipaddr_forany &operator= (const ipaddr_forany &); - - ipaddr_slice &operator[] (CORBA::ULong index); - const ipaddr_slice &operator[] (CORBA::ULong index) const; - operator ipaddr_slice * const &() const; - operator ipaddr_slice *&(); - // in, inout, out, _retn - const ipaddr_slice *in (void) const; - ipaddr_slice *inout (void); - ipaddr_slice *&out (void); - ipaddr_slice *_retn (void); - ipaddr_slice *ptr (void) const; - CORBA::Boolean nocopy (void) const; - private: - /* friend class CORBA_Any; */ - ipaddr_slice *ptr_; - CORBA::Boolean nocopy_; - }; + typedef CORBA::Octet ipaddr[4]; + typedef CORBA::Octet ipaddr_slice; + class TAO_PortableGroup_Export ipaddr_var + { + public: + ipaddr_var (void); // default constructor + ipaddr_var (ipaddr_slice *); + ipaddr_var (const ipaddr_var &); // copy constructor + ~ipaddr_var (void); // destructor + + ipaddr_var &operator= (ipaddr_slice *); + ipaddr_var &operator= (const ipaddr_var &); + + ipaddr_slice &operator[] (CORBA::ULong index); + const ipaddr_slice &operator[] (CORBA::ULong index) const; + operator ipaddr_slice * const &() const; + //Calls ipaddr_copy (used in sequences of ipaddr). + static void copy (ipaddr_slice *_tao_to, const ipaddr_slice *_tao_from); + // in, inout, out, _retn + const ipaddr_slice *in (void) const; + ipaddr_slice *inout (void); + ipaddr_slice *&out (void); + ipaddr_slice *_retn (void); + ipaddr_slice *ptr (void) const; + private: + ipaddr_slice *ptr_; + }; - static ipaddr_slice *ipaddr_alloc (void); - static void ipaddr_free (ipaddr_slice *_tao_slice); - static ipaddr_slice *ipaddr_dup (const ipaddr_slice *_tao_slice); - static void ipaddr_copy (ipaddr_slice *_tao_to, const ipaddr_slice *_tao_from); + typedef ipaddr ipaddr_out; + class TAO_PortableGroup_Export ipaddr_forany + { + public: + ipaddr_forany (void); // default constructor + ipaddr_forany (ipaddr_slice *, CORBA::Boolean nocopy=0); + ipaddr_forany (const ipaddr_forany &); // copy constructor + ~ipaddr_forany (void); // destructor + static void _tao_any_destructor (void*); + ipaddr_forany &operator= (ipaddr_slice *); + ipaddr_forany &operator= (const ipaddr_forany &); + + ipaddr_slice &operator[] (CORBA::ULong index); + const ipaddr_slice &operator[] (CORBA::ULong index) const; + operator ipaddr_slice * const &() const; + operator ipaddr_slice *&(); + // in, inout, out, _retn + const ipaddr_slice *in (void) const; + ipaddr_slice *inout (void); + ipaddr_slice *&out (void); + ipaddr_slice *_retn (void); + ipaddr_slice *ptr (void) const; + CORBA::Boolean nocopy (void) const; + private: + /* friend class CORBA_Any; */ + ipaddr_slice *ptr_; + CORBA::Boolean nocopy_; + }; + static ipaddr_slice *ipaddr_alloc (void); + static void ipaddr_free (ipaddr_slice *_tao_slice); + static ipaddr_slice *ipaddr_dup (const ipaddr_slice *_tao_slice); + static void ipaddr_copy (ipaddr_slice *_tao_to, const ipaddr_slice *_tao_from); + #endif /* end #if !defined */ - virtual CORBA::Object_ptr create_group ( - const char * type_id, - const MIOP::MulticastObjectGroupFactory::ipaddr class_d_address, - CORBA::UShort port, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - - protected: - MulticastObjectGroupFactory (); - - virtual ~MulticastObjectGroupFactory (void); - private: - MulticastObjectGroupFactory (const MulticastObjectGroupFactory &); - void operator= (const MulticastObjectGroupFactory &); - }; + virtual CORBA::Object_ptr create_group ( + const char * type_id, + const MIOP::MulticastObjectGroupFactory::ipaddr class_d_address, + CORBA::UShort port, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; + + protected: + MulticastObjectGroupFactory (); + + virtual ~MulticastObjectGroupFactory (void); + private: + MulticastObjectGroupFactory (const MulticastObjectGroupFactory &); + void operator= (const MulticastObjectGroupFactory &); + }; #endif /* end #if !defined */ - } +} TAO_NAMESPACE_CLOSE // module MIOP - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::UniqueId &); // copying version - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::UniqueId*); // noncopying version - TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::UniqueId *&); // deprecated +TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::UniqueId &); // copying version +TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::UniqueId*); // noncopying version +TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::UniqueId *&); // deprecated TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const MIOP::UniqueId *&); - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::PacketHeader_1_0 &); // copying version - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::PacketHeader_1_0*); // noncopying version - TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::PacketHeader_1_0 *&); // deprecated +TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::PacketHeader_1_0 &); // copying version +TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::PacketHeader_1_0*); // noncopying version +TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::PacketHeader_1_0 *&); // deprecated TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const MIOP::PacketHeader_1_0 *&); - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::Version &); // copying version - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::Version*); // noncopying version - TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::Version *&); // deprecated -TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const MIOP::Version *&); - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::UsingIpv4 &); // copying version - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::UsingIpv4*); // noncopying version - TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::UsingIpv4 *&); // deprecated -TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const MIOP::UsingIpv4 *&); - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::UsingIpv6 &); // copying version - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::UsingIpv6*); // noncopying version - TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::UsingIpv6 *&); // deprecated -TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const MIOP::UsingIpv6 *&); - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::IPEndpoints &); // copying version - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::IPEndpoints*); // noncopying version - TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::IPEndpoints *&); // deprecated -TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const MIOP::IPEndpoints *&); - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::UIPMC_ProfileBody &); // copying version - TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::UIPMC_ProfileBody*); // noncopying version - TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::UIPMC_ProfileBody *&); // deprecated +TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const MIOP::UIPMC_ProfileBody &); // copying version +TAO_PortableGroup_Export void operator<<= (CORBA::Any &, MIOP::UIPMC_ProfileBody*); // noncopying version +TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, MIOP::UIPMC_ProfileBody *&); // deprecated TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const MIOP::UIPMC_ProfileBody *&); - #ifndef __ACE_INLINE__ +#ifndef __ACE_INLINE__ #if !defined _TAO_CDR_OP_MIOP_UniqueId_H_ - #define _TAO_CDR_OP_MIOP_UniqueId_H_ +#define _TAO_CDR_OP_MIOP_UniqueId_H_ TAO_PortableGroup_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const MIOP::UniqueId & - ); - TAO_PortableGroup_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - MIOP::UniqueId & - ); + TAO_OutputCDR &, + const MIOP::UniqueId & + ); +TAO_PortableGroup_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + MIOP::UniqueId & + ); #endif /* _TAO_CDR_OP_MIOP_UniqueId_H_ */ - TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::PacketHeader_1_0 &); - TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::PacketHeader_1_0 &); +TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::PacketHeader_1_0 &); +TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::PacketHeader_1_0 &); TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::PacketHeader_1_0::_magic_forany &); - TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::PacketHeader_1_0::_magic_forany &); - TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::Version &); - TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::Version &); - TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::UsingIpv4 &); - TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::UsingIpv4 &); -TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::UsingIpv4::_class_d_address_forany &); - TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::UsingIpv4::_class_d_address_forany &); - TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::UsingIpv6 &); - TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::UsingIpv6 &); - TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::IPEndpoints &); - TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::IPEndpoints &); - TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::UIPMC_ProfileBody &); - TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::UIPMC_ProfileBody &); +TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::PacketHeader_1_0::_magic_forany &); +TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const MIOP::UIPMC_ProfileBody &); +TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, MIOP::UIPMC_ProfileBody &); #if !defined _TAO_CDR_OP_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent_H_ - #define _TAO_CDR_OP_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent_H_ +#define _TAO_CDR_OP_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent_H_ TAO_PortableGroup_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent & - ); - TAO_PortableGroup_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent & - ); + TAO_OutputCDR &, + const MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent & + ); +TAO_PortableGroup_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + MIOP::UIPMC_ProfileBody::_tao_seq_TaggedComponent & + ); #endif /* _TAO_CDR_OP_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent_H_ */ - #endif /* __ACE_INLINE__ */ +#endif /* __ACE_INLINE__ */ #if defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableGroup/miopC.i b/TAO/tao/PortableGroup/miopC.i index 30efff8800b..c0d9c2e596d 100644 --- a/TAO/tao/PortableGroup/miopC.i +++ b/TAO/tao/PortableGroup/miopC.i @@ -21,7 +21,7 @@ #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_BOUNDED_SEQUENCE_MIOP_UNIQUEID_252_CI_) #define __TAO_BOUNDED_SEQUENCE_MIOP_UNIQUEID_252_CI_ @@ -33,20 +33,20 @@ ACE_NEW_RETURN (retval, CORBA::Octet[252U], 0); return retval; } - - ACE_INLINE void + + ACE_INLINE void MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::freebuf (CORBA::Octet *buffer) // Free the sequence. { delete [] buffer; } - + ACE_INLINE MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::_TAO_Bounded_Sequence_MIOP_UniqueId_252 (void) // Default constructor. : TAO_Bounded_Base_Sequence (252U, 0) { } - + ACE_INLINE MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::_TAO_Bounded_Sequence_MIOP_UniqueId_252 (CORBA::ULong length, CORBA::Octet *data, @@ -55,7 +55,7 @@ : TAO_Bounded_Base_Sequence (252U, length, data, release) { } - + ACE_INLINE MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::_TAO_Bounded_Sequence_MIOP_UniqueId_252 (const _TAO_Bounded_Sequence_MIOP_UniqueId_252 &rhs) // Copy constructor. @@ -64,12 +64,12 @@ if (rhs.buffer_ != 0) { CORBA::Octet *tmp1 = _TAO_Bounded_Sequence_MIOP_UniqueId_252::allocbuf (252U); - + CORBA::Octet * const tmp2 = ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -77,31 +77,31 @@ this->buffer_ = 0; } } - + ACE_INLINE MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252 & MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::operator= (const _TAO_Bounded_Sequence_MIOP_UniqueId_252 &rhs) - // Assignment operator. + // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_ && this->buffer_ != 0) { } else this->buffer_ = _TAO_Bounded_Sequence_MIOP_UniqueId_252::allocbuf (rhs.maximum_); - + TAO_Bounded_Base_Sequence::operator= (rhs); - + CORBA::Octet* tmp1 = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_); CORBA::Octet* const tmp2 = ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + // = Accessors. ACE_INLINE CORBA::Octet & MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::operator[] (CORBA::ULong i)// operator [] @@ -117,7 +117,7 @@ const CORBA::Octet* tmp = ACE_reinterpret_cast (const CORBA::Octet* ACE_CAST_CONST,this->buffer_); return tmp[i]; } - + ACE_INLINE CORBA::Octet * MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::get_buffer (CORBA::Boolean orphan) { @@ -151,14 +151,14 @@ } return result; } - + ACE_INLINE const CORBA::Octet * MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::get_buffer (void) const { return ACE_reinterpret_cast(const CORBA::Octet * ACE_CAST_CONST, this->buffer_); } - - ACE_INLINE void + + ACE_INLINE void MIOP::_TAO_Bounded_Sequence_MIOP_UniqueId_252::replace (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *data, @@ -174,11 +174,11 @@ this->buffer_ = data; this->release_ = release; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_MIOP_UNIQUEID_CI_) #define _MIOP_UNIQUEID_CI_ @@ -241,7 +241,7 @@ MIOP::UniqueId_var::operator= (const ::MIOP::UniqueId_var &p) { UniqueId *deep_copy = new UniqueId (*p.ptr_); - + if (deep_copy != 0) { UniqueId *tmp = deep_copy; @@ -251,7 +251,7 @@ MIOP::UniqueId_var::operator= (const ::MIOP::UniqueId_var &p) } } } - + return *this; } @@ -279,20 +279,20 @@ MIOP::UniqueId_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE MIOP::UniqueId_var::operator const ::MIOP::UniqueId &() const // cast { return *this->ptr_; } -ACE_INLINE -MIOP::UniqueId_var::operator ::MIOP::UniqueId &() // cast +ACE_INLINE +MIOP::UniqueId_var::operator ::MIOP::UniqueId &() // cast { return *this->ptr_; } -ACE_INLINE -MIOP::UniqueId_var::operator ::MIOP::UniqueId &() const // cast +ACE_INLINE +MIOP::UniqueId_var::operator ::MIOP::UniqueId &() const // cast { return *this->ptr_; } @@ -321,7 +321,7 @@ MIOP::UniqueId_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::MIOP::UniqueId *& MIOP::UniqueId_var::out (void) { @@ -382,7 +382,7 @@ MIOP::UniqueId_out::operator= (UniqueId *p) return *this; } -ACE_INLINE +ACE_INLINE MIOP::UniqueId_out::operator ::MIOP::UniqueId *&() // cast { return this->ptr_; @@ -460,7 +460,7 @@ MIOP::PacketHeader_1_0_var::operator= (const ::MIOP::PacketHeader_1_0_var &p) { PacketHeader_1_0 *deep_copy = new PacketHeader_1_0 (*p.ptr_); - + if (deep_copy != 0) { PacketHeader_1_0 *tmp = deep_copy; @@ -470,7 +470,7 @@ MIOP::PacketHeader_1_0_var::operator= (const ::MIOP::PacketHeader_1_0_var &p) } } } - + return *this; } @@ -493,20 +493,20 @@ MIOP::PacketHeader_1_0_var::operator const ::MIOP::PacketHeader_1_0 &() const // } ACE_INLINE -MIOP::PacketHeader_1_0_var::operator ::MIOP::PacketHeader_1_0 &() // cast +MIOP::PacketHeader_1_0_var::operator ::MIOP::PacketHeader_1_0 &() // cast { return *this->ptr_; } ACE_INLINE -MIOP::PacketHeader_1_0_var::operator ::MIOP::PacketHeader_1_0 &() const // cast +MIOP::PacketHeader_1_0_var::operator ::MIOP::PacketHeader_1_0 &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -MIOP::PacketHeader_1_0_var::operator ::MIOP::PacketHeader_1_0 *&() // cast +MIOP::PacketHeader_1_0_var::operator ::MIOP::PacketHeader_1_0 *&() // cast { return this->ptr_; } @@ -523,7 +523,7 @@ MIOP::PacketHeader_1_0_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::MIOP::PacketHeader_1_0 *& MIOP::PacketHeader_1_0_var::out (void) { @@ -584,7 +584,7 @@ MIOP::PacketHeader_1_0_out::operator= (PacketHeader_1_0 *p) return *this; } -ACE_INLINE +ACE_INLINE MIOP::PacketHeader_1_0_out::operator ::MIOP::PacketHeader_1_0 *&() // cast { return this->ptr_; @@ -658,26 +658,26 @@ MIOP::PacketHeader_1_0::_magic_forany::operator= (const MIOP::PacketHeader_1_0:: return *this; } -ACE_INLINE +ACE_INLINE MIOP::PacketHeader_1_0::_magic_forany::operator MIOP::PacketHeader_1_0::_magic_slice * const &() const // cast { return this->ptr_; } -ACE_INLINE -MIOP::PacketHeader_1_0::_magic_forany::operator MIOP::PacketHeader_1_0::_magic_slice *&() // cast +ACE_INLINE +MIOP::PacketHeader_1_0::_magic_forany::operator MIOP::PacketHeader_1_0::_magic_slice *&() // cast { return this->ptr_; } -ACE_INLINE +ACE_INLINE const MIOP::PacketHeader_1_0::_magic_slice & MIOP::PacketHeader_1_0::_magic_forany::operator[] (CORBA::ULong index) const { return ACE_const_cast (const MIOP::PacketHeader_1_0::_magic_slice &, this->ptr_[index]); } -ACE_INLINE +ACE_INLINE MIOP::PacketHeader_1_0::_magic_slice & MIOP::PacketHeader_1_0::_magic_forany::operator[] (CORBA::ULong index) { @@ -721,897 +721,6 @@ MIOP::PacketHeader_1_0::_magic_forany::nocopy (void) const } // ************************************************************* -// Inline operations for class MIOP::Version_var -// ************************************************************* - -ACE_INLINE -MIOP::Version_var::Version_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -MIOP::Version_var::Version_var (Version *p) - : ptr_ (p) -{} - -ACE_INLINE -MIOP::Version_var::Version_var (const ::MIOP::Version_var &p) // copy constructor -{ - if (p.ptr_) - ACE_NEW (this->ptr_, ::MIOP::Version (*p.ptr_)); - else - this->ptr_ = 0; -} - -// fixed-size types only -ACE_INLINE -MIOP::Version_var::Version_var (const ::MIOP::Version &p) -{ - ACE_NEW (this->ptr_, ::MIOP::Version (p)); -} - -ACE_INLINE -MIOP::Version_var::~Version_var (void) // destructor -{ - delete this->ptr_; -} - -ACE_INLINE MIOP::Version_var & -MIOP::Version_var::operator= (Version *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE ::MIOP::Version_var & -MIOP::Version_var::operator= (const ::MIOP::Version_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - Version *deep_copy = - new Version (*p.ptr_); - - if (deep_copy != 0) - { - Version *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// fixed-size types only -ACE_INLINE MIOP::Version_var & -MIOP::Version_var::operator= (const ::MIOP::Version &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, ::MIOP::Version (p), *this); - } - return *this; -} - -ACE_INLINE const ::MIOP::Version * -MIOP::Version_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::MIOP::Version * -MIOP::Version_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -MIOP::Version_var::operator const ::MIOP::Version &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -MIOP::Version_var::operator ::MIOP::Version &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -MIOP::Version_var::operator ::MIOP::Version &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE const ::MIOP::Version & -MIOP::Version_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::MIOP::Version & -MIOP::Version_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for fixed size -ACE_INLINE ::MIOP::Version & -MIOP::Version_var::out (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::MIOP::Version -MIOP::Version_var::_retn (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::MIOP::Version * -MIOP::Version_var::ptr (void) const -{ - return this->ptr_; -} - -// ************************************************************* -// Inline operations for class MIOP::UsingIpv4_var -// ************************************************************* - -ACE_INLINE -MIOP::UsingIpv4_var::UsingIpv4_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -MIOP::UsingIpv4_var::UsingIpv4_var (UsingIpv4 *p) - : ptr_ (p) -{} - -ACE_INLINE -MIOP::UsingIpv4_var::UsingIpv4_var (const ::MIOP::UsingIpv4_var &p) // copy constructor -{ - if (p.ptr_) - ACE_NEW (this->ptr_, ::MIOP::UsingIpv4 (*p.ptr_)); - else - this->ptr_ = 0; -} - -// fixed-size types only -ACE_INLINE -MIOP::UsingIpv4_var::UsingIpv4_var (const ::MIOP::UsingIpv4 &p) -{ - ACE_NEW (this->ptr_, ::MIOP::UsingIpv4 (p)); -} - -ACE_INLINE -MIOP::UsingIpv4_var::~UsingIpv4_var (void) // destructor -{ - delete this->ptr_; -} - -ACE_INLINE MIOP::UsingIpv4_var & -MIOP::UsingIpv4_var::operator= (UsingIpv4 *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE ::MIOP::UsingIpv4_var & -MIOP::UsingIpv4_var::operator= (const ::MIOP::UsingIpv4_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - UsingIpv4 *deep_copy = - new UsingIpv4 (*p.ptr_); - - if (deep_copy != 0) - { - UsingIpv4 *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// fixed-size types only -ACE_INLINE MIOP::UsingIpv4_var & -MIOP::UsingIpv4_var::operator= (const ::MIOP::UsingIpv4 &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, ::MIOP::UsingIpv4 (p), *this); - } - return *this; -} - -ACE_INLINE const ::MIOP::UsingIpv4 * -MIOP::UsingIpv4_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv4 * -MIOP::UsingIpv4_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -MIOP::UsingIpv4_var::operator const ::MIOP::UsingIpv4 &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -MIOP::UsingIpv4_var::operator ::MIOP::UsingIpv4 &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -MIOP::UsingIpv4_var::operator ::MIOP::UsingIpv4 &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE const ::MIOP::UsingIpv4 & -MIOP::UsingIpv4_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv4 & -MIOP::UsingIpv4_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for fixed size -ACE_INLINE ::MIOP::UsingIpv4 & -MIOP::UsingIpv4_var::out (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv4 -MIOP::UsingIpv4_var::_retn (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv4 * -MIOP::UsingIpv4_var::ptr (void) const -{ - return this->ptr_; -} - -// ************************************************************* -// Inline operations for class MIOP::UsingIpv4::_class_d_address_forany -// ************************************************************* - -ACE_INLINE -MIOP::UsingIpv4::_class_d_address_forany::_class_d_address_forany (void) // default constructor - : ptr_ (0), - nocopy_ (0) -{} - -ACE_INLINE -MIOP::UsingIpv4::_class_d_address_forany::_class_d_address_forany (MIOP::UsingIpv4::_class_d_address_slice *p, CORBA::Boolean nocopy) - : ptr_ (p), - nocopy_ (nocopy) -{} - -ACE_INLINE -MIOP::UsingIpv4::_class_d_address_forany::_class_d_address_forany (const MIOP::UsingIpv4::_class_d_address_forany &p) // copy constructor -{ - this->ptr_ = MIOP::UsingIpv4::_class_d_address_dup (ACE_const_cast (const MIOP::UsingIpv4::_class_d_address_slice *, p.ptr_)); - this->nocopy_ = p.nocopy_; -} - -ACE_INLINE -MIOP::UsingIpv4::_class_d_address_forany::~_class_d_address_forany (void) // destructor -{ - // don't do anything -} - -ACE_INLINE MIOP::UsingIpv4::_class_d_address_forany & -MIOP::UsingIpv4::_class_d_address_forany::operator= (MIOP::UsingIpv4::_class_d_address_slice *p) -{ - // is what we own the same that is being assigned to us? - if (this->ptr_ != p) - { - // delete our stuff and assume ownership of p - MIOP::UsingIpv4::_class_d_address_free (this->ptr_); - this->ptr_ = p; - } - return *this; -} - -ACE_INLINE MIOP::UsingIpv4::_class_d_address_forany & -MIOP::UsingIpv4::_class_d_address_forany::operator= (const MIOP::UsingIpv4::_class_d_address_forany &p) -{ - if (this != &p) - { - // not assigning to ourselves - MIOP::UsingIpv4::_class_d_address_free (this->ptr_); // free old stuff - // deep copy - this->ptr_ = MIOP::UsingIpv4::_class_d_address_dup (ACE_const_cast (const MIOP::UsingIpv4::_class_d_address_slice *, p.ptr_)); - this->nocopy_ = p.nocopy_; - } - return *this; -} - -ACE_INLINE -MIOP::UsingIpv4::_class_d_address_forany::operator MIOP::UsingIpv4::_class_d_address_slice * const &() const // cast -{ - return this->ptr_; -} - -ACE_INLINE -MIOP::UsingIpv4::_class_d_address_forany::operator MIOP::UsingIpv4::_class_d_address_slice *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -const MIOP::UsingIpv4::_class_d_address_slice & -MIOP::UsingIpv4::_class_d_address_forany::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const MIOP::UsingIpv4::_class_d_address_slice &, this->ptr_[index]); -} - -ACE_INLINE -MIOP::UsingIpv4::_class_d_address_slice & -MIOP::UsingIpv4::_class_d_address_forany::operator[] (CORBA::ULong index) -{ - return this->ptr_[index]; -} - -ACE_INLINE const MIOP::UsingIpv4::_class_d_address_slice * -MIOP::UsingIpv4::_class_d_address_forany::in (void) const -{ - return ACE_const_cast (const MIOP::UsingIpv4::_class_d_address_slice *, this->ptr_); -} - -ACE_INLINE MIOP::UsingIpv4::_class_d_address_slice * -MIOP::UsingIpv4::_class_d_address_forany::inout (void) -{ - return this->ptr_; -} - -ACE_INLINE MIOP::UsingIpv4::_class_d_address_slice * & -MIOP::UsingIpv4::_class_d_address_forany::out (void) -{ - return this->ptr_; -} - -ACE_INLINE MIOP::UsingIpv4::_class_d_address_slice * -MIOP::UsingIpv4::_class_d_address_forany::_retn (void) -{ - return this->ptr_; -} - -ACE_INLINE MIOP::UsingIpv4::_class_d_address_slice * -MIOP::UsingIpv4::_class_d_address_forany::ptr (void) const -{ - return this->ptr_; -} - -ACE_INLINE CORBA::Boolean -MIOP::UsingIpv4::_class_d_address_forany::nocopy (void) const -{ - return this->nocopy_; -} - -// ************************************************************* -// Inline operations for class MIOP::UsingIpv6_var -// ************************************************************* - -ACE_INLINE -MIOP::UsingIpv6_var::UsingIpv6_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -MIOP::UsingIpv6_var::UsingIpv6_var (UsingIpv6 *p) - : ptr_ (p) -{} - -ACE_INLINE -MIOP::UsingIpv6_var::UsingIpv6_var (const ::MIOP::UsingIpv6_var &p) // copy constructor -{ - if (p.ptr_) - ACE_NEW (this->ptr_, ::MIOP::UsingIpv6 (*p.ptr_)); - else - this->ptr_ = 0; -} - -ACE_INLINE -MIOP::UsingIpv6_var::~UsingIpv6_var (void) // destructor -{ - delete this->ptr_; -} - -ACE_INLINE MIOP::UsingIpv6_var & -MIOP::UsingIpv6_var::operator= (UsingIpv6 *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE ::MIOP::UsingIpv6_var & -MIOP::UsingIpv6_var::operator= (const ::MIOP::UsingIpv6_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - UsingIpv6 *deep_copy = - new UsingIpv6 (*p.ptr_); - - if (deep_copy != 0) - { - UsingIpv6 *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::MIOP::UsingIpv6 * -MIOP::UsingIpv6_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv6 * -MIOP::UsingIpv6_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -MIOP::UsingIpv6_var::operator const ::MIOP::UsingIpv6 &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -MIOP::UsingIpv6_var::operator ::MIOP::UsingIpv6 &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -MIOP::UsingIpv6_var::operator ::MIOP::UsingIpv6 &() const // cast -{ - return *this->ptr_; -} - -// variable-size types only -ACE_INLINE -MIOP::UsingIpv6_var::operator ::MIOP::UsingIpv6 *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::MIOP::UsingIpv6 & -MIOP::UsingIpv6_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv6 & -MIOP::UsingIpv6_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for variable size -ACE_INLINE ::MIOP::UsingIpv6 *& -MIOP::UsingIpv6_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv6 * -MIOP::UsingIpv6_var::_retn (void) -{ - ::MIOP::UsingIpv6 *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::MIOP::UsingIpv6 * -MIOP::UsingIpv6_var::ptr (void) const -{ - return this->ptr_; -} - -// ************************************************************* -// Inline operations for class MIOP::UsingIpv6_out -// ************************************************************* - -ACE_INLINE -MIOP::UsingIpv6_out::UsingIpv6_out (::MIOP::UsingIpv6 *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -MIOP::UsingIpv6_out::UsingIpv6_out (UsingIpv6_var &p) // constructor from _var - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -MIOP::UsingIpv6_out::UsingIpv6_out (const ::MIOP::UsingIpv6_out &p) // copy constructor - : ptr_ (ACE_const_cast (UsingIpv6_out&, p).ptr_) -{} - -ACE_INLINE MIOP::UsingIpv6_out & -MIOP::UsingIpv6_out::operator= (const ::MIOP::UsingIpv6_out &p) -{ - this->ptr_ = ACE_const_cast (UsingIpv6_out&, p).ptr_; - return *this; -} - -ACE_INLINE MIOP::UsingIpv6_out & -MIOP::UsingIpv6_out::operator= (UsingIpv6 *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -MIOP::UsingIpv6_out::operator ::MIOP::UsingIpv6 *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv6 *& -MIOP::UsingIpv6_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::MIOP::UsingIpv6 * -MIOP::UsingIpv6_out::operator-> (void) -{ - return this->ptr_; -} - -// ************************************************************* -// Inline operations for union MIOP::IPEndpoints -// ************************************************************* - -// this reset method is used by the decoding engine -ACE_INLINE void -MIOP::IPEndpoints::_reset (void) -{ - this->_reset (this->disc_, 1); - ACE_OS::memcpy (&this->u_, 0, sizeof (this->u_)); -} - -// the implicit _default () method -ACE_INLINE void -MIOP::IPEndpoints::_default () -{ - this->disc_ = -32768; -} - -// accessor to set the discriminant -ACE_INLINE void -MIOP::IPEndpoints::_d (CORBA::Short discval) -{ - this->disc_ = discval; -} -// accessor to get the discriminant -ACE_INLINE CORBA::Short -MIOP::IPEndpoints::_d (void) const -{ - return this->disc_; -} - -// accessor to set the member -ACE_INLINE void -MIOP::IPEndpoints::ipv4_endpoints (const MIOP::UsingIpv4 &val) -{ - // set the discriminant val - this->_reset (0, 0); - this->disc_ = 0; - this->u_.ipv4_endpoints_ = val; -} - -// readonly get method -ACE_INLINE const MIOP::UsingIpv4 & -MIOP::IPEndpoints::ipv4_endpoints (void) const -{ - return this->u_.ipv4_endpoints_; -} - -// read/write get method -ACE_INLINE MIOP::UsingIpv4 & -MIOP::IPEndpoints::ipv4_endpoints (void) -{ - return this->u_.ipv4_endpoints_; -} - -// accessor to set the member -ACE_INLINE void -MIOP::IPEndpoints::ipv6_endpoints (const MIOP::UsingIpv6 &val) -{ - // set the discriminant val - this->_reset (1, 0); - this->disc_ = 1; - ACE_NEW ( - this->u_.ipv6_endpoints_, - MIOP::UsingIpv6 (val) - ); -} - -// readonly get method -ACE_INLINE const MIOP::UsingIpv6 & -MIOP::IPEndpoints::ipv6_endpoints (void) const -{ - return *this->u_.ipv6_endpoints_; -} - -// read/write get method -ACE_INLINE MIOP::UsingIpv6 & -MIOP::IPEndpoints::ipv6_endpoints (void) -{ - return *this->u_.ipv6_endpoints_; -} - - -#if !defined (_MIOP_IPENDPOINTS___VAR_CI_) -#define _MIOP_IPENDPOINTS___VAR_CI_ - -// ************************************************************* -// Inline operations for class MIOP::IPEndpoints_var -// ************************************************************* - -ACE_INLINE -MIOP::IPEndpoints_var::IPEndpoints_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -MIOP::IPEndpoints_var::IPEndpoints_var (IPEndpoints *p) - : ptr_ (p) -{} - -ACE_INLINE -MIOP::IPEndpoints_var::IPEndpoints_var (const ::MIOP::IPEndpoints_var &p) // copy constructor -{ - if (p.ptr_) - ACE_NEW (this->ptr_, ::MIOP::IPEndpoints (*p.ptr_)); - else - this->ptr_ = 0; -} - -ACE_INLINE -MIOP::IPEndpoints_var::~IPEndpoints_var (void) // destructor -{ - delete this->ptr_; -} - -ACE_INLINE ::MIOP::IPEndpoints_var & -MIOP::IPEndpoints_var::operator= (IPEndpoints *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE ::MIOP::IPEndpoints_var & -MIOP::IPEndpoints_var::operator= (const ::MIOP::IPEndpoints_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - IPEndpoints *deep_copy = - new IPEndpoints (*p.ptr_); - - if (deep_copy != 0) - { - IPEndpoints *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::MIOP::IPEndpoints * -MIOP::IPEndpoints_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::MIOP::IPEndpoints * -MIOP::IPEndpoints_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -MIOP::IPEndpoints_var::operator const ::MIOP::IPEndpoints &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -MIOP::IPEndpoints_var::operator ::MIOP::IPEndpoints &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -MIOP::IPEndpoints_var::operator ::MIOP::IPEndpoints &() const// cast -{ - return *this->ptr_; -} - -// variable-size types only -ACE_INLINE -MIOP::IPEndpoints_var::operator ::MIOP::IPEndpoints *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::MIOP::IPEndpoints & -MIOP::IPEndpoints_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::MIOP::IPEndpoints & -MIOP::IPEndpoints_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for variable size -ACE_INLINE ::MIOP::IPEndpoints *& -MIOP::IPEndpoints_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::MIOP::IPEndpoints * -MIOP::IPEndpoints_var::_retn (void) -{ - ::MIOP::IPEndpoints *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::MIOP::IPEndpoints * -MIOP::IPEndpoints_var::ptr (void) const -{ - return this->ptr_; -} - - -#endif /* end #if !defined */ - - -#if !defined (_MIOP_IPENDPOINTS___OUT_CI_) -#define _MIOP_IPENDPOINTS___OUT_CI_ - -// ************************************************************* -// Inline operations for class MIOP::IPEndpoints_out -// ************************************************************* - -ACE_INLINE -MIOP::IPEndpoints_out::IPEndpoints_out (IPEndpoints *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -MIOP::IPEndpoints_out::IPEndpoints_out (IPEndpoints_var &p) // constructor from _var - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -MIOP::IPEndpoints_out::IPEndpoints_out (const ::MIOP::IPEndpoints_out &p) // copy constructor - : ptr_ (ACE_const_cast (IPEndpoints_out&, p).ptr_) -{} - -ACE_INLINE ::MIOP::IPEndpoints_out & -MIOP::IPEndpoints_out::operator= (const ::MIOP::IPEndpoints_out &p) -{ - this->ptr_ = ACE_const_cast (IPEndpoints_out&, p).ptr_; - return *this; -} - -ACE_INLINE ::MIOP::IPEndpoints_out & -MIOP::IPEndpoints_out::operator= (IPEndpoints *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -MIOP::IPEndpoints_out::operator ::MIOP::IPEndpoints *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::MIOP::IPEndpoints *& -MIOP::IPEndpoints_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::MIOP::IPEndpoints * -MIOP::IPEndpoints_out::operator-> (void) -{ - return this->ptr_; -} - - -#endif /* end #if !defined */ - -// ************************************************************* // Inline operations for class MIOP::UIPMC_ProfileBody_var // ************************************************************* @@ -1662,7 +771,7 @@ MIOP::UIPMC_ProfileBody_var::operator= (const ::MIOP::UIPMC_ProfileBody_var &p) { UIPMC_ProfileBody *deep_copy = new UIPMC_ProfileBody (*p.ptr_); - + if (deep_copy != 0) { UIPMC_ProfileBody *tmp = deep_copy; @@ -1672,7 +781,7 @@ MIOP::UIPMC_ProfileBody_var::operator= (const ::MIOP::UIPMC_ProfileBody_var &p) } } } - + return *this; } @@ -1695,20 +804,20 @@ MIOP::UIPMC_ProfileBody_var::operator const ::MIOP::UIPMC_ProfileBody &() const } ACE_INLINE -MIOP::UIPMC_ProfileBody_var::operator ::MIOP::UIPMC_ProfileBody &() // cast +MIOP::UIPMC_ProfileBody_var::operator ::MIOP::UIPMC_ProfileBody &() // cast { return *this->ptr_; } ACE_INLINE -MIOP::UIPMC_ProfileBody_var::operator ::MIOP::UIPMC_ProfileBody &() const // cast +MIOP::UIPMC_ProfileBody_var::operator ::MIOP::UIPMC_ProfileBody &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -MIOP::UIPMC_ProfileBody_var::operator ::MIOP::UIPMC_ProfileBody *&() // cast +MIOP::UIPMC_ProfileBody_var::operator ::MIOP::UIPMC_ProfileBody *&() // cast { return this->ptr_; } @@ -1725,7 +834,7 @@ MIOP::UIPMC_ProfileBody_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::MIOP::UIPMC_ProfileBody *& MIOP::UIPMC_ProfileBody_var::out (void) { @@ -1786,7 +895,7 @@ MIOP::UIPMC_ProfileBody_out::operator= (UIPMC_ProfileBody *p) return *this; } -ACE_INLINE +ACE_INLINE MIOP::UIPMC_ProfileBody_out::operator ::MIOP::UIPMC_ProfileBody *&() // cast { return this->ptr_; @@ -1806,7 +915,7 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CI_) #define __TAO_UNBOUNDED_SEQUENCE_MIOP_UIPMC_PROFILEBODY__TAO_SEQ_TAGGEDCOMPONENT_CI_ @@ -1819,24 +928,24 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); return retval; } - + ACE_INLINE void MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::freebuf (IOP::TaggedComponent *buffer) // Free the sequence. { delete [] buffer; } - + ACE_INLINE MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (void) // Default constructor. { } - + ACE_INLINE MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::allocbuf (maximum)) { } - + ACE_INLINE MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (CORBA::ULong maximum, CORBA::ULong length, @@ -1845,7 +954,7 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + ACE_INLINE MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent (const _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent &rhs) // Copy constructor. @@ -1855,10 +964,10 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) { IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::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 @@ -1866,14 +975,14 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) this->buffer_ = 0; } } - + ACE_INLINE MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent & MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::operator= (const _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -1886,18 +995,18 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) } else this->buffer_ = _TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::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 & MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::operator[] (CORBA::ULong i) @@ -1907,7 +1016,7 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); return tmp[i]; } - + ACE_INLINE const IOP::TaggedComponent & MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::operator[] (CORBA::ULong i) const // operator [] @@ -1916,9 +1025,9 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) 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 * MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::get_buffer (CORBA::Boolean orphan) { @@ -1952,13 +1061,13 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) } return result; } - + ACE_INLINE const IOP::TaggedComponent * MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::get_buffer (void) const { return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); } - + ACE_INLINE void MIOP::UIPMC_ProfileBody::_TAO_Unbounded_Sequence_MIOP_UIPMC_ProfileBody__tao_seq_TaggedComponent::replace (CORBA::ULong max, CORBA::ULong length, @@ -1975,11 +1084,11 @@ MIOP::UIPMC_ProfileBody_out::operator-> (void) this->buffer_ = data; this->release_ = release; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ // ************************************************************* // Inline operations for class MIOP::MulticastObjectGroupFactory::ipaddr_var // ************************************************************* @@ -2032,13 +1141,13 @@ MIOP::MulticastObjectGroupFactory::ipaddr_var::operator= (const MIOP::MulticastO return *this; } -ACE_INLINE +ACE_INLINE MIOP::MulticastObjectGroupFactory::ipaddr_var::operator MIOP::MulticastObjectGroupFactory::ipaddr_slice * const &() const // cast { return this->ptr_; } -ACE_INLINE +ACE_INLINE const MIOP::MulticastObjectGroupFactory::ipaddr_slice & MIOP::MulticastObjectGroupFactory::ipaddr_var::operator[] (CORBA::ULong index) const { @@ -2050,7 +1159,7 @@ MIOP::MulticastObjectGroupFactory::ipaddr_var::operator[] (CORBA::ULong index) c #endif /* ACE_HAS_BROKEN_IMPLICIT_CONST_CAST */ } -ACE_INLINE +ACE_INLINE MIOP::MulticastObjectGroupFactory::ipaddr_slice & MIOP::MulticastObjectGroupFactory::ipaddr_var::operator[] (CORBA::ULong index) { @@ -2153,26 +1262,26 @@ MIOP::MulticastObjectGroupFactory::ipaddr_forany::operator= (const MIOP::Multica return *this; } -ACE_INLINE +ACE_INLINE MIOP::MulticastObjectGroupFactory::ipaddr_forany::operator MIOP::MulticastObjectGroupFactory::ipaddr_slice * const &() const // cast { return this->ptr_; } -ACE_INLINE -MIOP::MulticastObjectGroupFactory::ipaddr_forany::operator MIOP::MulticastObjectGroupFactory::ipaddr_slice *&() // cast +ACE_INLINE +MIOP::MulticastObjectGroupFactory::ipaddr_forany::operator MIOP::MulticastObjectGroupFactory::ipaddr_slice *&() // cast { return this->ptr_; } -ACE_INLINE +ACE_INLINE const MIOP::MulticastObjectGroupFactory::ipaddr_slice & MIOP::MulticastObjectGroupFactory::ipaddr_forany::operator[] (CORBA::ULong index) const { return ACE_const_cast (const MIOP::MulticastObjectGroupFactory::ipaddr_slice &, this->ptr_[index]); } -ACE_INLINE +ACE_INLINE MIOP::MulticastObjectGroupFactory::ipaddr_slice & MIOP::MulticastObjectGroupFactory::ipaddr_forany::operator[] (CORBA::ULong index) { @@ -2267,7 +1376,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const MIOP::PacketHea return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, MIOP::PacketHeader_1_0 &_tao_aggregate) @@ -2290,171 +1399,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, MIOP::PacketHeader_1_0 return 1; else return 0; - -} - -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const MIOP::Version &_tao_aggregate) -{ - if ( - (strm << CORBA::Any::from_octet (_tao_aggregate.major)) && - (strm << CORBA::Any::from_octet (_tao_aggregate.minor)) - ) - return 1; - else - return 0; - -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, MIOP::Version &_tao_aggregate) -{ - if ( - (strm >> CORBA::Any::to_octet (_tao_aggregate.major)) && - (strm >> CORBA::Any::to_octet (_tao_aggregate.minor)) - ) - return 1; - else - return 0; - -} - -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const MIOP::UsingIpv4::_class_d_address_forany &_tao_array) -{ - return strm.write_octet_array ((const ACE_CDR::Octet *)_tao_array.in (), 4); -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, MIOP::UsingIpv4::_class_d_address_forany &_tao_array) -{ - return strm.read_octet_array ((ACE_CDR::Octet *) _tao_array.out (), 4); -} - -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const MIOP::UsingIpv4 &_tao_aggregate) -{ - MIOP::UsingIpv4::_class_d_address_forany _tao_aggregate_class_d_address - (ACE_const_cast ( - MIOP::UsingIpv4::_class_d_address_slice*, - _tao_aggregate.class_d_address - ) - ); - if ( - (strm << _tao_aggregate.port) && - (strm << _tao_aggregate_class_d_address) - ) - return 1; - else - return 0; - -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, MIOP::UsingIpv4 &_tao_aggregate) -{ - MIOP::UsingIpv4::_class_d_address_forany _tao_aggregate_class_d_address - (ACE_const_cast ( - MIOP::UsingIpv4::_class_d_address_slice*, - _tao_aggregate.class_d_address - ) - ); - if ( - (strm >> _tao_aggregate.port) && - (strm >> _tao_aggregate_class_d_address) - ) - return 1; - else - return 0; - -} - -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const MIOP::UsingIpv6 &_tao_aggregate) -{ - if ( - (strm << _tao_aggregate.port) && - (strm << _tao_aggregate.address.in ()) - ) - return 1; - else - return 0; - -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, MIOP::UsingIpv6 &_tao_aggregate) -{ - if ( - (strm >> _tao_aggregate.port) && - (strm >> _tao_aggregate.address.out ()) - ) - return 1; - else - return 0; - -} - -ACE_INLINE CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const MIOP::IPEndpoints &_tao_union - ) -{ - if ( !(strm << _tao_union._d ()) ) - { - return 0; - } - CORBA::Boolean result = 1; - switch (_tao_union._d ()) - { - case 0: - { - result = strm << _tao_union.ipv4_endpoints (); - } - break; - case 1: - { - result = strm << _tao_union.ipv6_endpoints (); - } - break; - default: - break; - } - return result; -} - -ACE_INLINE CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - MIOP::IPEndpoints &_tao_union - ) -{ - CORBA::Short _tao_discriminant; - if ( !(strm >> _tao_discriminant) ) - { - return 0; - } - CORBA::Boolean result = 1; - switch (_tao_discriminant) - { - case 0: - { - MIOP::UsingIpv4 _tao_union_tmp; - result = strm >> _tao_union_tmp; - if (result) - { - _tao_union.ipv4_endpoints (_tao_union_tmp); - _tao_union._d (_tao_discriminant); - } - } - break; - case 1: - { - MIOP::UsingIpv6 _tao_union_tmp; - result = strm >> _tao_union_tmp; - if (result) - { - _tao_union.ipv6_endpoints (_tao_union_tmp); - _tao_union._d (_tao_discriminant); - } - } - break; - default: - _tao_union._d (_tao_discriminant); - break; - } - return result; + } @@ -2476,25 +1421,27 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const MIOP::UIPMC_Pro { if ( (strm << _tao_aggregate.miop_version) && - (strm << _tao_aggregate.endpoints) && + (strm << _tao_aggregate.the_address.in ()) && + (strm << _tao_aggregate.the_port) && (strm << _tao_aggregate.components) ) return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, MIOP::UIPMC_ProfileBody &_tao_aggregate) { if ( (strm >> _tao_aggregate.miop_version) && - (strm >> _tao_aggregate.endpoints) && + (strm >> _tao_aggregate.the_address.out ()) && + (strm >> _tao_aggregate.the_port) && (strm >> _tao_aggregate.components) ) return 1; else return 0; - + } diff --git a/TAO/tao/PortableGroup/miopS.h b/TAO/tao/PortableGroup/miopS.h index 67da382d880..1c9398e8f2b 100644 --- a/TAO/tao/PortableGroup/miopS.h +++ b/TAO/tao/PortableGroup/miopS.h @@ -24,6 +24,7 @@ #include "ace/pre.h" #include "IOPS.h" +#include "GIOPS.h" #include "miopC.h" diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 4996eed5b6f..2c7844b960e 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -3089,11 +3089,11 @@ TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )) { TAO_POA_PortableGroup_Hooks *hooks = - orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV); + this->orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV); ACE_CHECK_RETURN (PortableServer::ObjectId::_nil ()); PortableServer::ObjectId *obj_id = @@ -3108,11 +3108,11 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )) { TAO_POA_PortableGroup_Hooks *hooks = - orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV); + this->orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV); ACE_CHECK_RETURN (PortableServer::IDs::_nil ()); PortableServer::IDs *id_list = @@ -3122,6 +3122,40 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref, return id_list; } +void +TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )) +{ + TAO_POA_PortableGroup_Hooks *hooks = + this->orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV); + ACE_CHECK; + + hooks->associate_reference_with_id (*this, ref, oid, ACE_TRY_ENV); + ACE_CHECK; +} + +void +TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )) +{ + TAO_POA_PortableGroup_Hooks *hooks = + this->orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV); + ACE_CHECK; + + hooks->disassociate_reference_with_id (*this, ref, oid, ACE_TRY_ENV); + ACE_CHECK; +} + #endif /* TAO_HAS_MIOP == 1 */ #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index 07883522215..09e24355b67 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -627,23 +627,46 @@ public: #if (TAO_HAS_MIOP == 1) virtual PortableServer::ObjectId * create_id_for_reference ( CORBA::Object_ptr the_ref, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )); virtual PortableServer::IDs * reference_to_ids ( CORBA::Object_ptr the_ref, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )); + + virtual void associate_reference_with_id ( + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )); + + virtual void disassociate_reference_with_id ( + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )); + #endif /* TAO_HAS_MIOP == 1 */ TAO_POA_Policies &policies (void); diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl index f4ee6e81523..f36be07d264 100644 --- a/TAO/tao/PortableServer/PortableServer.pidl +++ b/TAO/tao/PortableServer/PortableServer.pidl @@ -71,8 +71,9 @@ module PortableServer { Object forward_reference; }; - // @@ Frank - MIOP specific calls + // @@ Frank - MIOP specific types + exception NotAGroupObject {}; typedef sequence <ObjectId> IDs; // @@ Frank - End MIOP @@ -287,13 +288,21 @@ module PortableServer { Object id_to_reference( in ObjectId oid) raises (ObjectNotActive, WrongPolicy); - // @@ Frank - MIOP specific calls + // @@ Frank - MIOP specific methods ObjectId create_id_for_reference(in CORBA::Object the_ref) - raises (WrongAdapter); + raises (NotAGroupObject); IDs reference_to_ids(in CORBA::Object the_ref) - raises (WrongAdapter); + raises (NotAGroupObject); + + void associate_reference_with_id (in CORBA::Object ref, + in ObjectId oid) + raises (NotAGroupObject); + + void disassociate_reference_with_id (in CORBA::Object ref, + in ObjectId oid) + raises (NotAGroupObject); // @@ Frank - End MIOP }; diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 14e9b4a9ea4..864a591ee43 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -22,7 +22,7 @@ #include "PortableServerC.h" #include "POA.h" #include "tao/ORB.h" -#include "tao/ORB_Core.h" +#include "tao/ORB_Core.h" // @@ Frank: Added... #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus @@ -34,7 +34,7 @@ #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_ @@ -44,7 +44,7 @@ { PortableServer::POA **tmp = 0; tmp = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (length); - + if (this->buffer_ != 0) { PortableServer::POA **old = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_); @@ -59,7 +59,7 @@ tmp[i] = old[i]; } } - + if (this->release_) { delete[] old; @@ -67,42 +67,42 @@ } this->buffer_ = tmp; } - + void PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) { CORBA::release (tmp[i]); tmp[i] = PortableServer::POA::_nil (); } - + _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp); this->buffer_ = 0; } - + PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::~_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void) { this->_deallocate_buffer (); } - + void PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) { PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_); - + for (CORBA::ULong i = nl; i < ol; ++i) { CORBA::release (tmp[i]); tmp[i] = PortableServer::POA::_nil (); } } - - void + + void PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast ( void* target, CORBA_Object *src, @@ -120,11 +120,11 @@ PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, src); return *tmp; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLESERVER_POALIST_CS_) #define _PORTABLESERVER_POALIST_CS_ @@ -136,30 +136,30 @@ PortableServer::POAList::POAList (void) {} PortableServer::POAList::POAList (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Object_Sequence_PortableServer_POAList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} PortableServer::POAList::POAList (CORBA::ULong max, CORBA::ULong length, PortableServer::POA_ptr *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Object_Sequence_PortableServer_POAList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} PortableServer::POAList::POAList (const POAList &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Object_Sequence_PortableServer_POAList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} PortableServer::POAList::~POAList (void) // dtor @@ -184,30 +184,30 @@ void PortableServer::POAList::_tao_any_destructor (void *x) PortableServer::ObjectId::ObjectId (void) {} PortableServer::ObjectId::ObjectId (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) {} PortableServer::ObjectId::ObjectId (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) {} PortableServer::ObjectId::ObjectId (const ObjectId &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) {} PortableServer::ObjectId::~ObjectId (void) // dtor @@ -225,17 +225,17 @@ static const CORBA::Long _oc_PortableServer_ObjectId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f4f), - ACE_NTOHL (0x626a6563), - ACE_NTOHL (0x7449643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f4f), + ACE_NTOHL (0x626a6563), + ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/ObjectId:1.0 9, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ObjectId CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -322,7 +322,7 @@ void PortableServer::ForwardRequest::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -335,7 +335,7 @@ void PortableServer::ForwardRequest::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -359,42 +359,42 @@ static const CORBA::Long _oc_PortableServer_ForwardRequest[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f46), - ACE_NTOHL (0x6f727761), - ACE_NTOHL (0x72645265), - ACE_NTOHL (0x71756573), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f46), + ACE_NTOHL (0x6f727761), + ACE_NTOHL (0x72645265), + ACE_NTOHL (0x71756573), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:PortableServer/ForwardRequest:1.0 15, - ACE_NTOHL (0x466f7277), - ACE_NTOHL (0x61726452), - ACE_NTOHL (0x65717565), + ACE_NTOHL (0x466f7277), + ACE_NTOHL (0x61726452), + ACE_NTOHL (0x65717565), ACE_NTOHL (0x73740000), // name = ForwardRequest 1, // member count 18, - ACE_NTOHL (0x666f7277), - ACE_NTOHL (0x6172645f), - ACE_NTOHL (0x72656665), - ACE_NTOHL (0x72656e63), + ACE_NTOHL (0x666f7277), + ACE_NTOHL (0x6172645f), + ACE_NTOHL (0x72656665), + ACE_NTOHL (0x72656e63), ACE_NTOHL (0x65000000), // name = forward_reference CORBA::tk_objref, 52, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Object:1.0 7, - ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000), // name = Object }; @@ -419,9 +419,135 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const return ::PortableServer::_tc_ForwardRequest; } +// Default constructor. +PortableServer::NotAGroupObject::NotAGroupObject (void) + : CORBA_UserException ("IDL:PortableServer/NotAGroupObject:1.0") +{ +} -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) +// Destructor - all members are of self managing types. +PortableServer::NotAGroupObject::~NotAGroupObject (void) +{ +} + +void PortableServer::NotAGroupObject::_tao_any_destructor (void *x) +{ + NotAGroupObject *tmp = ACE_static_cast (NotAGroupObject*,x); + delete tmp; +} + +// Copy constructor. +PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp) + : CORBA_UserException (_tao_excp._id ()) +{ +} + +// Assignment operator. +PortableServer::NotAGroupObject& +PortableServer::NotAGroupObject::operator= (const ::PortableServer::NotAGroupObject &_tao_excp) +{ + this->CORBA_UserException::operator= (_tao_excp); + return *this; +} +// Narrow. +PortableServer::NotAGroupObject * +PortableServer::NotAGroupObject::_downcast (CORBA::Exception *exc) +{ + if (!ACE_OS::strcmp ("IDL:PortableServer/NotAGroupObject:1.0", exc->_id ())) + { + return ACE_dynamic_cast (NotAGroupObject *, exc); + } + else + { + return 0; + } +} + +void PortableServer::NotAGroupObject::_raise () +{ + TAO_RAISE (*this); +} + +void PortableServer::NotAGroupObject::_tao_encode ( + TAO_OutputCDR &cdr, + CORBA::Environment &ACE_TRY_ENV + ) const +{ + if (cdr << *this) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +void PortableServer::NotAGroupObject::_tao_decode ( + TAO_InputCDR &cdr, + CORBA::Environment &ACE_TRY_ENV + ) +{ + if (cdr >> *this) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +// TAO extension - the _alloc method. +CORBA::Exception *PortableServer::NotAGroupObject::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::PortableServer::NotAGroupObject, 0); + return retval; +} + +static const CORBA::Long _oc_PortableServer_NotAGroupObject[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 39, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f4e), + ACE_NTOHL (0x6f744147), + ACE_NTOHL (0x726f7570), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63743a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/NotAGroupObject:1.0 + 16, + ACE_NTOHL (0x4e6f7441), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x704f626a), + ACE_NTOHL (0x65637400), // name = NotAGroupObject + 0, // member count +}; + +static CORBA::TypeCode _tc_TAO_tc_PortableServer_NotAGroupObject ( + CORBA::tk_except, + sizeof (_oc_PortableServer_NotAGroupObject), + (char *) &_oc_PortableServer_NotAGroupObject, + 0, + sizeof (PortableServer::NotAGroupObject) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NotAGroupObject, &_tc_TAO_tc_PortableServer_NotAGroupObject) +TAO_NAMESPACE_END + + +// TAO extension - the virtual _type method. +CORBA::TypeCode_ptr PortableServer::NotAGroupObject::_type (void) const +{ + return ::PortableServer::_tc_NotAGroupObject; +} + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CS_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CS_ @@ -430,43 +556,43 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const { PortableServer::ObjectId* tmp = 0; tmp = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (length); - + if (this->buffer_ != 0) { PortableServer::ObjectId *old = ACE_reinterpret_cast (PortableServer::ObjectId *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (old); - + } this->buffer_ = tmp; } - + void PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + PortableServer::ObjectId *tmp = ACE_reinterpret_cast (PortableServer::ObjectId *,this->buffer_); - + _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp); this->buffer_ = 0; - } - + } + PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::~_TAO_Unbounded_Sequence_PortableServer_IDs (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLESERVER_IDS_CS_) #define _PORTABLESERVER_IDS_CS_ @@ -478,30 +604,30 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const PortableServer::IDs::IDs (void) {} PortableServer::IDs::IDs (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableServer_IDs #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableServer::ObjectId> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} PortableServer::IDs::IDs (CORBA::ULong max, CORBA::ULong length, PortableServer::ObjectId *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableServer_IDs #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableServer::ObjectId> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} PortableServer::IDs::IDs (const IDs &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableServer_IDs #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableServer::ObjectId> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} PortableServer::IDs::~IDs (void) // dtor @@ -519,12 +645,12 @@ static const CORBA::Long _oc_PortableServer_IDs[] = { TAO_ENCAP_BYTE_ORDER, // byte order 27, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f49), - ACE_NTOHL (0x44733a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f49), + ACE_NTOHL (0x44733a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/IDs:1.0 4, ACE_NTOHL (0x49447300), // name = IDs @@ -535,17 +661,17 @@ static const CORBA::Long _oc_PortableServer_IDs[] = 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f4f), - ACE_NTOHL (0x626a6563), - ACE_NTOHL (0x7449643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f4f), + ACE_NTOHL (0x626a6563), + ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/ObjectId:1.0 9, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ObjectId CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -609,34 +735,34 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f54), - ACE_NTOHL (0x68726561), - ACE_NTOHL (0x64506f6c), - ACE_NTOHL (0x69637956), - ACE_NTOHL (0x616c7565), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f54), + ACE_NTOHL (0x68726561), + ACE_NTOHL (0x64506f6c), + ACE_NTOHL (0x69637956), + ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:PortableServer/ThreadPolicyValue:1.0 18, - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = ThreadPolicyValue 2, // member count 15, - ACE_NTOHL (0x4f52425f), - ACE_NTOHL (0x4354524c), - ACE_NTOHL (0x5f4d4f44), + ACE_NTOHL (0x4f52425f), + ACE_NTOHL (0x4354524c), + ACE_NTOHL (0x5f4d4f44), ACE_NTOHL (0x454c0000), // name = ORB_CTRL_MODEL 20, - ACE_NTOHL (0x53494e47), - ACE_NTOHL (0x4c455f54), - ACE_NTOHL (0x48524541), - ACE_NTOHL (0x445f4d4f), + ACE_NTOHL (0x53494e47), + ACE_NTOHL (0x4c455f54), + ACE_NTOHL (0x48524541), + ACE_NTOHL (0x445f4d4f), ACE_NTOHL (0x44454c00), // name = SINGLE_THREAD_MODEL }; @@ -701,7 +827,7 @@ PortableServer::ThreadPolicy_var::operator const ::PortableServer::ThreadPolicy_ return this->ptr_; } -PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast +PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast { return this->ptr_; } @@ -905,7 +1031,7 @@ void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -922,31 +1048,31 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f4c), - ACE_NTOHL (0x69666573), - ACE_NTOHL (0x70616e50), - ACE_NTOHL (0x6f6c6963), - ACE_NTOHL (0x7956616c), - ACE_NTOHL (0x75653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f4c), + ACE_NTOHL (0x69666573), + ACE_NTOHL (0x70616e50), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x7956616c), + ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/LifespanPolicyValue:1.0 20, - ACE_NTOHL (0x4c696665), - ACE_NTOHL (0x7370616e), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), + ACE_NTOHL (0x4c696665), + ACE_NTOHL (0x7370616e), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = LifespanPolicyValue 2, // member count 10, - ACE_NTOHL (0x5452414e), - ACE_NTOHL (0x5349454e), + ACE_NTOHL (0x5452414e), + ACE_NTOHL (0x5349454e), ACE_NTOHL (0x54000000), // name = TRANSIENT 11, - ACE_NTOHL (0x50455253), - ACE_NTOHL (0x49535445), + ACE_NTOHL (0x50455253), + ACE_NTOHL (0x49535445), ACE_NTOHL (0x4e540000), // name = PERSISTENT }; @@ -1011,7 +1137,7 @@ PortableServer::LifespanPolicy_var::operator const ::PortableServer::LifespanPol return this->ptr_; } -PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast +PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast { return this->ptr_; } @@ -1215,7 +1341,7 @@ void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1230,33 +1356,33 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 47, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f49), - ACE_NTOHL (0x64556e69), - ACE_NTOHL (0x7175656e), - ACE_NTOHL (0x65737350), - ACE_NTOHL (0x6f6c6963), - ACE_NTOHL (0x7956616c), - ACE_NTOHL (0x75653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f49), + ACE_NTOHL (0x64556e69), + ACE_NTOHL (0x7175656e), + ACE_NTOHL (0x65737350), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x7956616c), + ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/IdUniquenessPolicyValue:1.0 24, - ACE_NTOHL (0x4964556e), - ACE_NTOHL (0x69717565), - ACE_NTOHL (0x6e657373), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), + ACE_NTOHL (0x4964556e), + ACE_NTOHL (0x69717565), + ACE_NTOHL (0x6e657373), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = IdUniquenessPolicyValue 2, // member count 10, - ACE_NTOHL (0x554e4951), - ACE_NTOHL (0x55455f49), + ACE_NTOHL (0x554e4951), + ACE_NTOHL (0x55455f49), ACE_NTOHL (0x44000000), // name = UNIQUE_ID 12, - ACE_NTOHL (0x4d554c54), - ACE_NTOHL (0x49504c45), + ACE_NTOHL (0x4d554c54), + ACE_NTOHL (0x49504c45), ACE_NTOHL (0x5f494400), // name = MULTIPLE_ID }; @@ -1321,7 +1447,7 @@ PortableServer::IdUniquenessPolicy_var::operator const ::PortableServer::IdUniqu return this->ptr_; } -PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast +PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast { return this->ptr_; } @@ -1525,7 +1651,7 @@ void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1540,32 +1666,32 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 47, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f49), - ACE_NTOHL (0x64417373), - ACE_NTOHL (0x69676e6d), - ACE_NTOHL (0x656e7450), - ACE_NTOHL (0x6f6c6963), - ACE_NTOHL (0x7956616c), - ACE_NTOHL (0x75653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f49), + ACE_NTOHL (0x64417373), + ACE_NTOHL (0x69676e6d), + ACE_NTOHL (0x656e7450), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x7956616c), + ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/IdAssignmentPolicyValue:1.0 24, - ACE_NTOHL (0x49644173), - ACE_NTOHL (0x7369676e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), + ACE_NTOHL (0x49644173), + ACE_NTOHL (0x7369676e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = IdAssignmentPolicyValue 2, // member count 8, - ACE_NTOHL (0x55534552), + ACE_NTOHL (0x55534552), ACE_NTOHL (0x5f494400), // name = USER_ID 10, - ACE_NTOHL (0x53595354), - ACE_NTOHL (0x454d5f49), + ACE_NTOHL (0x53595354), + ACE_NTOHL (0x454d5f49), ACE_NTOHL (0x44000000), // name = SYSTEM_ID }; @@ -1630,7 +1756,7 @@ PortableServer::IdAssignmentPolicy_var::operator const ::PortableServer::IdAssig return this->ptr_; } -PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast +PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast { return this->ptr_; } @@ -1834,7 +1960,7 @@ void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1851,42 +1977,42 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f49), - ACE_NTOHL (0x6d706c69), - ACE_NTOHL (0x63697441), - ACE_NTOHL (0x63746976), - ACE_NTOHL (0x6174696f), - ACE_NTOHL (0x6e506f6c), - ACE_NTOHL (0x69637956), - ACE_NTOHL (0x616c7565), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f49), + ACE_NTOHL (0x6d706c69), + ACE_NTOHL (0x63697441), + ACE_NTOHL (0x63746976), + ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x6e506f6c), + ACE_NTOHL (0x69637956), + ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:PortableServer/ImplicitActivationPolicyValue:1.0 30, - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x69636974), - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x69636974), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = ImplicitActivationPolicyValue 2, // member count 20, - ACE_NTOHL (0x494d504c), - ACE_NTOHL (0x49434954), - ACE_NTOHL (0x5f414354), - ACE_NTOHL (0x49564154), + ACE_NTOHL (0x494d504c), + ACE_NTOHL (0x49434954), + ACE_NTOHL (0x5f414354), + ACE_NTOHL (0x49564154), ACE_NTOHL (0x494f4e00), // name = IMPLICIT_ACTIVATION 23, - ACE_NTOHL (0x4e4f5f49), - ACE_NTOHL (0x4d504c49), - ACE_NTOHL (0x4349545f), - ACE_NTOHL (0x41435449), - ACE_NTOHL (0x56415449), + ACE_NTOHL (0x4e4f5f49), + ACE_NTOHL (0x4d504c49), + ACE_NTOHL (0x4349545f), + ACE_NTOHL (0x41435449), + ACE_NTOHL (0x56415449), ACE_NTOHL (0x4f4e0000), // name = NO_IMPLICIT_ACTIVATION }; @@ -1951,7 +2077,7 @@ PortableServer::ImplicitActivationPolicy_var::operator const ::PortableServer::I return this->ptr_; } -PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast +PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast { return this->ptr_; } @@ -2155,7 +2281,7 @@ void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2170,34 +2296,34 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f53), - ACE_NTOHL (0x65727661), - ACE_NTOHL (0x6e745265), - ACE_NTOHL (0x74656e74), - ACE_NTOHL (0x696f6e50), - ACE_NTOHL (0x6f6c6963), - ACE_NTOHL (0x7956616c), - ACE_NTOHL (0x75653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f53), + ACE_NTOHL (0x65727661), + ACE_NTOHL (0x6e745265), + ACE_NTOHL (0x74656e74), + ACE_NTOHL (0x696f6e50), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x7956616c), + ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/ServantRetentionPolicyValue:1.0 28, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x616e7452), - ACE_NTOHL (0x6574656e), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x616e7452), + ACE_NTOHL (0x6574656e), + ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = ServantRetentionPolicyValue 2, // member count 7, - ACE_NTOHL (0x52455441), + ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000), // name = RETAIN 11, - ACE_NTOHL (0x4e4f4e5f), - ACE_NTOHL (0x52455441), + ACE_NTOHL (0x4e4f4e5f), + ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000), // name = NON_RETAIN }; @@ -2262,7 +2388,7 @@ PortableServer::ServantRetentionPolicy_var::operator const ::PortableServer::Ser return this->ptr_; } -PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast +PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast { return this->ptr_; } @@ -2466,7 +2592,7 @@ void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2481,48 +2607,48 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 52, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f52), - ACE_NTOHL (0x65717565), - ACE_NTOHL (0x73745072), - ACE_NTOHL (0x6f636573), - ACE_NTOHL (0x73696e67), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), - ACE_NTOHL (0x6c75653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f52), + ACE_NTOHL (0x65717565), + ACE_NTOHL (0x73745072), + ACE_NTOHL (0x6f636573), + ACE_NTOHL (0x73696e67), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), + ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/RequestProcessingPolicyValue:1.0 29, - ACE_NTOHL (0x52657175), - ACE_NTOHL (0x65737450), - ACE_NTOHL (0x726f6365), - ACE_NTOHL (0x7373696e), - ACE_NTOHL (0x67506f6c), - ACE_NTOHL (0x69637956), - ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x52657175), + ACE_NTOHL (0x65737450), + ACE_NTOHL (0x726f6365), + ACE_NTOHL (0x7373696e), + ACE_NTOHL (0x67506f6c), + ACE_NTOHL (0x69637956), + ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = RequestProcessingPolicyValue 3, // member count 27, - ACE_NTOHL (0x5553455f), - ACE_NTOHL (0x41435449), - ACE_NTOHL (0x56455f4f), - ACE_NTOHL (0x424a4543), - ACE_NTOHL (0x545f4d41), - ACE_NTOHL (0x505f4f4e), + ACE_NTOHL (0x5553455f), + ACE_NTOHL (0x41435449), + ACE_NTOHL (0x56455f4f), + ACE_NTOHL (0x424a4543), + ACE_NTOHL (0x545f4d41), + ACE_NTOHL (0x505f4f4e), ACE_NTOHL (0x4c590000), // name = USE_ACTIVE_OBJECT_MAP_ONLY 20, - ACE_NTOHL (0x5553455f), - ACE_NTOHL (0x44454641), - ACE_NTOHL (0x554c545f), - ACE_NTOHL (0x53455256), + ACE_NTOHL (0x5553455f), + ACE_NTOHL (0x44454641), + ACE_NTOHL (0x554c545f), + ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e5400), // name = USE_DEFAULT_SERVANT 20, - ACE_NTOHL (0x5553455f), - ACE_NTOHL (0x53455256), - ACE_NTOHL (0x414e545f), - ACE_NTOHL (0x4d414e41), + ACE_NTOHL (0x5553455f), + ACE_NTOHL (0x53455256), + ACE_NTOHL (0x414e545f), + ACE_NTOHL (0x4d414e41), ACE_NTOHL (0x47455200), // name = USE_SERVANT_MANAGER }; @@ -2587,7 +2713,7 @@ PortableServer::RequestProcessingPolicy_var::operator const ::PortableServer::Re return this->ptr_; } -PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast +PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast { return this->ptr_; } @@ -2791,7 +2917,7 @@ void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -2852,7 +2978,7 @@ PortableServer::POAManager_var::operator const ::PortableServer::POAManager_ptr return this->ptr_; } -PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast +PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast { return this->ptr_; } @@ -3044,7 +3170,7 @@ void *PortableServer::POAManager::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -3173,7 +3299,7 @@ PortableServer::AdapterActivator_var::operator const ::PortableServer::AdapterAc return this->ptr_; } -PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast +PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast { return this->ptr_; } @@ -3365,7 +3491,7 @@ void *PortableServer::AdapterActivator::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -3424,7 +3550,7 @@ PortableServer::ServantManager_var::operator const ::PortableServer::ServantMana return this->ptr_; } -PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast +PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast { return this->ptr_; } @@ -3616,7 +3742,7 @@ void *PortableServer::ServantManager::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -3675,7 +3801,7 @@ PortableServer::ServantActivator_var::operator const ::PortableServer::ServantAc return this->ptr_; } -PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast +PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast { return this->ptr_; } @@ -3879,7 +4005,7 @@ void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -3938,7 +4064,7 @@ PortableServer::ServantLocator_var::operator const ::PortableServer::ServantLoca return this->ptr_; } -PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast +PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast { return this->ptr_; } @@ -4142,7 +4268,7 @@ void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -4203,7 +4329,7 @@ PortableServer::POA_var::operator const ::PortableServer::POA_ptr &() const // c return this->ptr_; } -PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast +PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast { return this->ptr_; } @@ -4395,7 +4521,7 @@ void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -5148,7 +5274,7 @@ PortableServer::Current_var::operator const ::PortableServer::Current_ptr &() co return this->ptr_; } -PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast +PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast { return this->ptr_; } @@ -5352,7 +5478,7 @@ void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -5499,13 +5625,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Ob ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -5587,13 +5713,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableServer::ForwardRequest *)_tao_any.value (); @@ -5638,6 +5764,96 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo return 0; } +void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying +{ + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + PortableServer::_tc_NotAGroupObject, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); +} + +void operator<<= (CORBA::Any &_tao_any, PortableServer::NotAGroupObject *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + PortableServer::_tc_NotAGroupObject, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + PortableServer::NotAGroupObject::_tao_any_destructor + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::NotAGroupObject *&_tao_elem) +{ + return _tao_any >>= ACE_const_cast( + const PortableServer::NotAGroupObject*&, + _tao_elem + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::NotAGroupObject *&_tao_elem) +{ + _tao_elem = 0; + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); + + CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject, ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + + if (_tao_any.any_owns_data ()) + { + _tao_elem = (PortableServer::NotAGroupObject *)_tao_any.value (); + return 1; + } + else + { + PortableServer::NotAGroupObject *tmp; + ACE_NEW_RETURN (tmp, PortableServer::NotAGroupObject, 0); + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () + ); + CORBA::String_var interface_repository_id; + if (!(stream >> interface_repository_id.out ())) + return 0; + if (ACE_OS::strcmp ( + interface_repository_id.in (), + "IDL:PortableServer/NotAGroupObject:1.0")) + return 0; + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( + PortableServer::_tc_NotAGroupObject, + 1, + tmp, + PortableServer::NotAGroupObject::_tao_any_destructor + ); + _tao_elem = tmp; + return 1; + } + else + { + delete tmp; + } + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} + void operator<<= ( CORBA::Any &_tao_any, const PortableServer::IDs &_tao_elem @@ -5682,13 +5898,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ID ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -5749,13 +5965,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -5798,13 +6014,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Lifespan ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -5845,13 +6061,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUnique ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -5892,13 +6108,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssign ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -5941,13 +6157,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Implicit ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -5988,13 +6204,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantR ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -6035,13 +6251,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestP ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -6129,20 +6345,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 = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableServer::ObjectId *)&_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 @@ -6159,10 +6375,10 @@ 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) + 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)) @@ -6172,7 +6388,7 @@ CORBA::Boolean operator>> ( strm.orb_core ()->resource_factory ()-> input_cdr_allocator_type_locked () == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + 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); @@ -6183,6 +6399,7 @@ CORBA::Boolean operator>> ( 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 @@ -6217,7 +6434,7 @@ 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) + if (0 >= _tao_seq_len) return 1; // Add a check to the length of the sequence // to make sure it does not exceed the length @@ -6234,3 +6451,4 @@ CORBA::Boolean operator>> ( } return 0; // error } + diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 3bb6d3cb147..8344e8e4fd6 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -75,7 +75,7 @@ TAO_NAMESPACE PortableServer typedef TAO_DynamicImplementation DynamicImplementation; class POA; - + #if !defined (_PORTABLESERVER_POA___PTR_CH_) #define _PORTABLESERVER_POA___PTR_CH_ @@ -91,23 +91,23 @@ TAO_NAMESPACE PortableServer { public: POA_var (void); // default constructor - POA_var (POA_ptr p) : ptr_ (p) {} + POA_var (POA_ptr p) : ptr_ (p) {} POA_var (const POA_var &); // copy constructor ~POA_var (void); // destructor - + POA_var &operator= (POA_ptr); POA_var &operator= (const POA_var &); POA_ptr operator-> (void) const; - + operator const POA_ptr &() const; operator POA_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn POA_ptr in (void) const; POA_ptr &inout (void); POA_ptr &out (void); POA_ptr _retn (void); POA_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static POA_ptr duplicate (POA_ptr); @@ -115,7 +115,7 @@ TAO_NAMESPACE PortableServer static POA_ptr nil (void); static POA_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: POA_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -142,7 +142,7 @@ TAO_NAMESPACE PortableServer operator POA_ptr &(); POA_ptr &ptr (void); POA_ptr operator-> (void); - + private: POA_ptr &ptr_; }; @@ -152,7 +152,7 @@ TAO_NAMESPACE PortableServer #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_ @@ -160,7 +160,7 @@ TAO_NAMESPACE PortableServer { public: // = Initialization and termination methods. - + _TAO_Unbounded_Object_Sequence_PortableServer_POAList (void); _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum); _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum, @@ -182,42 +182,42 @@ TAO_NAMESPACE PortableServer virtual void _downcast ( void* target, CORBA_Object *src, - CORBA_Environment &ACE_TRY_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA_Object* _upcast (void *src) const; - + }; #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_PORTABLESERVER_POALIST_CH_) #define _PORTABLESERVER_POALIST_CH_ class POAList; class POAList_var; - + // ************************************************************* // POAList // ************************************************************* - - class TAO_PortableServer_Export POAList : public + + class TAO_PortableServer_Export POAList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Object_Sequence_PortableServer_POAList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Object_Sequence<POA,POA_var> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: POAList (void); // default ctor POAList (CORBA::ULong max); // uses max size POAList ( - CORBA::ULong max, - CORBA::ULong length, - POA_ptr *buffer, + CORBA::ULong max, + CORBA::ULong length, + POA_ptr *buffer, CORBA::Boolean release = 0 ); POAList (const POAList &); // copy ctor @@ -229,7 +229,7 @@ TAO_NAMESPACE PortableServer #endif /* ! __GNUC__ || g++ >= 2.8 */ }; - + #endif /* end #if !defined */ @@ -247,20 +247,20 @@ TAO_NAMESPACE PortableServer POAList_var (POAList *); POAList_var (const POAList_var &); // copy constructor ~POAList_var (void); // destructor - + POAList_var &operator= (POAList *); POAList_var &operator= (const POAList_var &); POAList *operator-> (void); const POAList *operator-> (void) const; - + operator const POAList &() const; operator POAList &(); operator POAList &() const; operator POAList *&(); // variable-size base types only - + TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index); - - // in, inout, out, _retn + + // in, inout, out, _retn const POAList &in (void) const; POAList &inout (void); POAList *&out (void); @@ -290,7 +290,7 @@ TAO_NAMESPACE PortableServer POAList *&ptr (void); POAList *operator-> (void); TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index); - + private: POAList *&ptr_; // assignment from T_var not allowed @@ -306,25 +306,25 @@ TAO_NAMESPACE PortableServer class ObjectId; class ObjectId_var; - + // ************************************************************* // ObjectId // ************************************************************* - - class TAO_PortableServer_Export ObjectId : public + + class TAO_PortableServer_Export ObjectId : 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 */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: ObjectId (void); // default ctor ObjectId (CORBA::ULong max); // uses max size ObjectId ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, CORBA::Boolean release = 0 ); ObjectId (const ObjectId &); // copy ctor @@ -345,7 +345,7 @@ TAO_NAMESPACE PortableServer #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ }; - + #endif /* end #if !defined */ @@ -364,21 +364,21 @@ TAO_NAMESPACE PortableServer ObjectId_var (const ObjectId_var &); // copy constructor ObjectId_var (const ObjectId &); // fixed-size base types only ~ObjectId_var (void); // destructor - + ObjectId_var &operator= (ObjectId *); ObjectId_var &operator= (const ObjectId_var &); ObjectId_var &operator= (const ObjectId &); // fixed-size base types only ObjectId *operator-> (void); const ObjectId *operator-> (void) const; - + operator const ObjectId &() const; operator ObjectId &(); operator ObjectId &() const; - + CORBA::Octet & operator[] (CORBA::ULong index); const CORBA::Octet & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const ObjectId &in (void) const; ObjectId &inout (void); ObjectId *&out (void); @@ -408,7 +408,7 @@ TAO_NAMESPACE PortableServer ObjectId *&ptr (void); ObjectId *operator-> (void); CORBA::Octet & operator[] (CORBA::ULong index); - + private: ObjectId *&ptr_; // assignment from T_var not allowed @@ -433,35 +433,35 @@ TAO_NAMESPACE PortableServer ForwardRequest (void); // Default constructor. - + ForwardRequest (const ForwardRequest &); // Copy constructor. - + ~ForwardRequest (void); // Destructor. - + static void _tao_any_destructor (void*); - + ForwardRequest &operator= (const ForwardRequest &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ForwardRequest *_downcast (CORBA::Exception *); ForwardRequest ( const CORBA::Object_ptr _tao_forward_reference ); - + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; @@ -473,8 +473,54 @@ TAO_NAMESPACE PortableServer #endif /* end #if !defined */ -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) +#if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_) +#define _PORTABLESERVER_NOTAGROUPOBJECT_CH_ + + class TAO_PortableServer_Export NotAGroupObject : public CORBA::UserException + { + public: + + NotAGroupObject (void); + // Default constructor. + + NotAGroupObject (const NotAGroupObject &); + // Copy constructor. + + ~NotAGroupObject (void); + // Destructor. + + static void _tao_any_destructor (void*); + + NotAGroupObject &operator= (const NotAGroupObject &); + + virtual void _raise (void); + + virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment & + ) const; + + virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment & + ); + + static NotAGroupObject *_downcast (CORBA::Exception *); + + + // = TAO extension. + static CORBA::Exception *_alloc (void); + virtual CORBA::TypeCode_ptr _type (void) const; + }; // Exception PortableServer::NotAGroupObject. + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NotAGroupObject; + +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CH_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CH_ @@ -482,9 +528,9 @@ TAO_NAMESPACE PortableServer { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_PortableServer_IDs (void); // Default constructor. - _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum); _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum, CORBA::ULong length, ObjectId *data, @@ -501,7 +547,7 @@ TAO_NAMESPACE PortableServer virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) - + ObjectId *get_buffer (CORBA::Boolean orphan = 0); const ObjectId *get_buffer (void) const; void replace (CORBA::ULong max, @@ -513,32 +559,32 @@ TAO_NAMESPACE PortableServer #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_PORTABLESERVER_IDS_CH_) #define _PORTABLESERVER_IDS_CH_ class IDs; class IDs_var; - + // ************************************************************* // IDs // ************************************************************* - - class TAO_PortableServer_Export IDs : public + + class TAO_PortableServer_Export IDs : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableServer_IDs #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ObjectId> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: IDs (void); // default ctor IDs (CORBA::ULong max); // uses max size IDs ( - CORBA::ULong max, - CORBA::ULong length, - ObjectId *buffer, + CORBA::ULong max, + CORBA::ULong length, + ObjectId *buffer, CORBA::Boolean release = 0 ); IDs (const IDs &); // copy ctor @@ -550,7 +596,7 @@ TAO_NAMESPACE PortableServer #endif /* ! __GNUC__ || g++ >= 2.8 */ }; - + #endif /* end #if !defined */ @@ -568,21 +614,21 @@ TAO_NAMESPACE PortableServer IDs_var (IDs *); IDs_var (const IDs_var &); // copy constructor ~IDs_var (void); // destructor - + IDs_var &operator= (IDs *); IDs_var &operator= (const IDs_var &); IDs *operator-> (void); const IDs *operator-> (void) const; - + operator const IDs &() const; operator IDs &(); operator IDs &() const; operator IDs *&(); // variable-size base types only - + ObjectId & operator[] (CORBA::ULong index); const ObjectId & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const IDs &in (void) const; IDs &inout (void); IDs *&out (void); @@ -612,7 +658,7 @@ TAO_NAMESPACE PortableServer IDs *&ptr (void); IDs *operator-> (void); ObjectId & operator[] (CORBA::ULong index); - + private: IDs *&ptr_; // assignment from T_var not allowed @@ -643,7 +689,7 @@ TAO_NAMESPACE PortableServer enum ThreadPolicyValue { ORB_CTRL_MODEL, - SINGLE_THREAD_MODEL + SINGLE_THREAD_MODEL }; #if (TAO_HAS_MINIMUM_POA == 0) @@ -657,7 +703,7 @@ TAO_NAMESPACE PortableServer class ThreadPolicy; typedef ThreadPolicy *ThreadPolicy_ptr; - + #endif /* end #if !defined */ @@ -668,23 +714,23 @@ TAO_NAMESPACE PortableServer { public: ThreadPolicy_var (void); // default constructor - ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {} + ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {} ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor ~ThreadPolicy_var (void); // destructor - + ThreadPolicy_var &operator= (ThreadPolicy_ptr); ThreadPolicy_var &operator= (const ThreadPolicy_var &); ThreadPolicy_ptr operator-> (void) const; - + operator const ThreadPolicy_ptr &() const; operator ThreadPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ThreadPolicy_ptr in (void) const; ThreadPolicy_ptr &inout (void); ThreadPolicy_ptr &out (void); ThreadPolicy_ptr _retn (void); ThreadPolicy_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ThreadPolicy_ptr duplicate (ThreadPolicy_ptr); @@ -692,7 +738,7 @@ TAO_NAMESPACE PortableServer static ThreadPolicy_ptr nil (void); static ThreadPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: ThreadPolicy_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -719,7 +765,7 @@ TAO_NAMESPACE PortableServer operator ThreadPolicy_ptr &(); ThreadPolicy_ptr &ptr (void); ThreadPolicy_ptr operator-> (void); - + private: ThreadPolicy_ptr &ptr_; }; @@ -743,12 +789,12 @@ TAO_NAMESPACE PortableServer static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj); static ThreadPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ThreadPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ThreadPolicy_ptr _nil (void) @@ -757,7 +803,7 @@ TAO_NAMESPACE PortableServer } virtual PortableServer::ThreadPolicyValue value ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -765,12 +811,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ThreadPolicy (); - + virtual ~ThreadPolicy (void); private: ThreadPolicy (const ThreadPolicy &); @@ -785,7 +831,7 @@ TAO_NAMESPACE PortableServer enum LifespanPolicyValue { TRANSIENT, - PERSISTENT + PERSISTENT }; typedef LifespanPolicyValue &LifespanPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicyValue; @@ -796,7 +842,7 @@ TAO_NAMESPACE PortableServer class LifespanPolicy; typedef LifespanPolicy *LifespanPolicy_ptr; - + #endif /* end #if !defined */ @@ -807,23 +853,23 @@ TAO_NAMESPACE PortableServer { public: LifespanPolicy_var (void); // default constructor - LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {} + LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {} LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor ~LifespanPolicy_var (void); // destructor - + LifespanPolicy_var &operator= (LifespanPolicy_ptr); LifespanPolicy_var &operator= (const LifespanPolicy_var &); LifespanPolicy_ptr operator-> (void) const; - + operator const LifespanPolicy_ptr &() const; operator LifespanPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn LifespanPolicy_ptr in (void) const; LifespanPolicy_ptr &inout (void); LifespanPolicy_ptr &out (void); LifespanPolicy_ptr _retn (void); LifespanPolicy_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static LifespanPolicy_ptr duplicate (LifespanPolicy_ptr); @@ -831,7 +877,7 @@ TAO_NAMESPACE PortableServer static LifespanPolicy_ptr nil (void); static LifespanPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: LifespanPolicy_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -858,7 +904,7 @@ TAO_NAMESPACE PortableServer operator LifespanPolicy_ptr &(); LifespanPolicy_ptr &ptr (void); LifespanPolicy_ptr operator-> (void); - + private: LifespanPolicy_ptr &ptr_; }; @@ -882,12 +928,12 @@ TAO_NAMESPACE PortableServer static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj); static LifespanPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static LifespanPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static LifespanPolicy_ptr _nil (void) @@ -896,7 +942,7 @@ TAO_NAMESPACE PortableServer } virtual PortableServer::LifespanPolicyValue value ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -904,12 +950,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: LifespanPolicy (); - + virtual ~LifespanPolicy (void); private: LifespanPolicy (const LifespanPolicy &); @@ -922,7 +968,7 @@ TAO_NAMESPACE PortableServer enum IdUniquenessPolicyValue { UNIQUE_ID, - MULTIPLE_ID + MULTIPLE_ID }; typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue; @@ -933,7 +979,7 @@ TAO_NAMESPACE PortableServer class IdUniquenessPolicy; typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr; - + #endif /* end #if !defined */ @@ -944,23 +990,23 @@ TAO_NAMESPACE PortableServer { public: IdUniquenessPolicy_var (void); // default constructor - IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {} + IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {} IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor ~IdUniquenessPolicy_var (void); // destructor - + IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr); IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &); IdUniquenessPolicy_ptr operator-> (void) const; - + operator const IdUniquenessPolicy_ptr &() const; operator IdUniquenessPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn IdUniquenessPolicy_ptr in (void) const; IdUniquenessPolicy_ptr &inout (void); IdUniquenessPolicy_ptr &out (void); IdUniquenessPolicy_ptr _retn (void); IdUniquenessPolicy_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static IdUniquenessPolicy_ptr duplicate (IdUniquenessPolicy_ptr); @@ -968,7 +1014,7 @@ TAO_NAMESPACE PortableServer static IdUniquenessPolicy_ptr nil (void); static IdUniquenessPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: IdUniquenessPolicy_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -995,7 +1041,7 @@ TAO_NAMESPACE PortableServer operator IdUniquenessPolicy_ptr &(); IdUniquenessPolicy_ptr &ptr (void); IdUniquenessPolicy_ptr operator-> (void); - + private: IdUniquenessPolicy_ptr &ptr_; }; @@ -1019,12 +1065,12 @@ TAO_NAMESPACE PortableServer static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj); static IdUniquenessPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static IdUniquenessPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static IdUniquenessPolicy_ptr _nil (void) @@ -1033,7 +1079,7 @@ TAO_NAMESPACE PortableServer } virtual PortableServer::IdUniquenessPolicyValue value ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1041,12 +1087,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: IdUniquenessPolicy (); - + virtual ~IdUniquenessPolicy (void); private: IdUniquenessPolicy (const IdUniquenessPolicy &); @@ -1059,7 +1105,7 @@ TAO_NAMESPACE PortableServer enum IdAssignmentPolicyValue { USER_ID, - SYSTEM_ID + SYSTEM_ID }; typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue; @@ -1070,7 +1116,7 @@ TAO_NAMESPACE PortableServer class IdAssignmentPolicy; typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr; - + #endif /* end #if !defined */ @@ -1081,23 +1127,23 @@ TAO_NAMESPACE PortableServer { public: IdAssignmentPolicy_var (void); // default constructor - IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {} + IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {} IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor ~IdAssignmentPolicy_var (void); // destructor - + IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr); IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &); IdAssignmentPolicy_ptr operator-> (void) const; - + operator const IdAssignmentPolicy_ptr &() const; operator IdAssignmentPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn IdAssignmentPolicy_ptr in (void) const; IdAssignmentPolicy_ptr &inout (void); IdAssignmentPolicy_ptr &out (void); IdAssignmentPolicy_ptr _retn (void); IdAssignmentPolicy_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static IdAssignmentPolicy_ptr duplicate (IdAssignmentPolicy_ptr); @@ -1105,7 +1151,7 @@ TAO_NAMESPACE PortableServer static IdAssignmentPolicy_ptr nil (void); static IdAssignmentPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: IdAssignmentPolicy_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1132,7 +1178,7 @@ TAO_NAMESPACE PortableServer operator IdAssignmentPolicy_ptr &(); IdAssignmentPolicy_ptr &ptr (void); IdAssignmentPolicy_ptr operator-> (void); - + private: IdAssignmentPolicy_ptr &ptr_; }; @@ -1156,12 +1202,12 @@ TAO_NAMESPACE PortableServer static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj); static IdAssignmentPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static IdAssignmentPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static IdAssignmentPolicy_ptr _nil (void) @@ -1170,7 +1216,7 @@ TAO_NAMESPACE PortableServer } virtual PortableServer::IdAssignmentPolicyValue value ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1178,12 +1224,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: IdAssignmentPolicy (); - + virtual ~IdAssignmentPolicy (void); private: IdAssignmentPolicy (const IdAssignmentPolicy &); @@ -1196,7 +1242,7 @@ TAO_NAMESPACE PortableServer enum ImplicitActivationPolicyValue { IMPLICIT_ACTIVATION, - NO_IMPLICIT_ACTIVATION + NO_IMPLICIT_ACTIVATION }; #if (TAO_HAS_MINIMUM_POA == 0) @@ -1210,7 +1256,7 @@ TAO_NAMESPACE PortableServer class ImplicitActivationPolicy; typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr; - + #endif /* end #if !defined */ @@ -1221,23 +1267,23 @@ TAO_NAMESPACE PortableServer { public: ImplicitActivationPolicy_var (void); // default constructor - ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {} + ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {} ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor ~ImplicitActivationPolicy_var (void); // destructor - + ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr); ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &); ImplicitActivationPolicy_ptr operator-> (void) const; - + operator const ImplicitActivationPolicy_ptr &() const; operator ImplicitActivationPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ImplicitActivationPolicy_ptr in (void) const; ImplicitActivationPolicy_ptr &inout (void); ImplicitActivationPolicy_ptr &out (void); ImplicitActivationPolicy_ptr _retn (void); ImplicitActivationPolicy_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ImplicitActivationPolicy_ptr duplicate (ImplicitActivationPolicy_ptr); @@ -1245,7 +1291,7 @@ TAO_NAMESPACE PortableServer static ImplicitActivationPolicy_ptr nil (void); static ImplicitActivationPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: ImplicitActivationPolicy_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1272,7 +1318,7 @@ TAO_NAMESPACE PortableServer operator ImplicitActivationPolicy_ptr &(); ImplicitActivationPolicy_ptr &ptr (void); ImplicitActivationPolicy_ptr operator-> (void); - + private: ImplicitActivationPolicy_ptr &ptr_; }; @@ -1296,12 +1342,12 @@ TAO_NAMESPACE PortableServer static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj); static ImplicitActivationPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ImplicitActivationPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ImplicitActivationPolicy_ptr _nil (void) @@ -1310,7 +1356,7 @@ TAO_NAMESPACE PortableServer } virtual PortableServer::ImplicitActivationPolicyValue value ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1318,12 +1364,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ImplicitActivationPolicy (); - + virtual ~ImplicitActivationPolicy (void); private: ImplicitActivationPolicy (const ImplicitActivationPolicy &); @@ -1338,7 +1384,7 @@ TAO_NAMESPACE PortableServer enum ServantRetentionPolicyValue { RETAIN, - NON_RETAIN + NON_RETAIN }; #if (TAO_HAS_MINIMUM_POA == 0) @@ -1352,7 +1398,7 @@ TAO_NAMESPACE PortableServer class ServantRetentionPolicy; typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr; - + #endif /* end #if !defined */ @@ -1363,23 +1409,23 @@ TAO_NAMESPACE PortableServer { public: ServantRetentionPolicy_var (void); // default constructor - ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {} + ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {} ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor ~ServantRetentionPolicy_var (void); // destructor - + ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr); ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &); ServantRetentionPolicy_ptr operator-> (void) const; - + operator const ServantRetentionPolicy_ptr &() const; operator ServantRetentionPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServantRetentionPolicy_ptr in (void) const; ServantRetentionPolicy_ptr &inout (void); ServantRetentionPolicy_ptr &out (void); ServantRetentionPolicy_ptr _retn (void); ServantRetentionPolicy_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ServantRetentionPolicy_ptr duplicate (ServantRetentionPolicy_ptr); @@ -1387,7 +1433,7 @@ TAO_NAMESPACE PortableServer static ServantRetentionPolicy_ptr nil (void); static ServantRetentionPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: ServantRetentionPolicy_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1414,7 +1460,7 @@ TAO_NAMESPACE PortableServer operator ServantRetentionPolicy_ptr &(); ServantRetentionPolicy_ptr &ptr (void); ServantRetentionPolicy_ptr operator-> (void); - + private: ServantRetentionPolicy_ptr &ptr_; }; @@ -1438,12 +1484,12 @@ TAO_NAMESPACE PortableServer static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj); static ServantRetentionPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServantRetentionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServantRetentionPolicy_ptr _nil (void) @@ -1452,7 +1498,7 @@ TAO_NAMESPACE PortableServer } virtual PortableServer::ServantRetentionPolicyValue value ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1460,12 +1506,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ServantRetentionPolicy (); - + virtual ~ServantRetentionPolicy (void); private: ServantRetentionPolicy (const ServantRetentionPolicy &); @@ -1481,7 +1527,7 @@ TAO_NAMESPACE PortableServer { USE_ACTIVE_OBJECT_MAP_ONLY, USE_DEFAULT_SERVANT, - USE_SERVANT_MANAGER + USE_SERVANT_MANAGER }; #if (TAO_HAS_MINIMUM_POA == 0) @@ -1495,7 +1541,7 @@ TAO_NAMESPACE PortableServer class RequestProcessingPolicy; typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr; - + #endif /* end #if !defined */ @@ -1506,23 +1552,23 @@ TAO_NAMESPACE PortableServer { public: RequestProcessingPolicy_var (void); // default constructor - RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {} + RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {} RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor ~RequestProcessingPolicy_var (void); // destructor - + RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr); RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &); RequestProcessingPolicy_ptr operator-> (void) const; - + operator const RequestProcessingPolicy_ptr &() const; operator RequestProcessingPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn RequestProcessingPolicy_ptr in (void) const; RequestProcessingPolicy_ptr &inout (void); RequestProcessingPolicy_ptr &out (void); RequestProcessingPolicy_ptr _retn (void); RequestProcessingPolicy_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static RequestProcessingPolicy_ptr duplicate (RequestProcessingPolicy_ptr); @@ -1530,7 +1576,7 @@ TAO_NAMESPACE PortableServer static RequestProcessingPolicy_ptr nil (void); static RequestProcessingPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: RequestProcessingPolicy_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1557,7 +1603,7 @@ TAO_NAMESPACE PortableServer operator RequestProcessingPolicy_ptr &(); RequestProcessingPolicy_ptr &ptr (void); RequestProcessingPolicy_ptr operator-> (void); - + private: RequestProcessingPolicy_ptr &ptr_; }; @@ -1581,12 +1627,12 @@ TAO_NAMESPACE PortableServer static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj); static RequestProcessingPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static RequestProcessingPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static RequestProcessingPolicy_ptr _nil (void) @@ -1595,7 +1641,7 @@ TAO_NAMESPACE PortableServer } virtual PortableServer::RequestProcessingPolicyValue value ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1603,12 +1649,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: RequestProcessingPolicy (); - + virtual ~RequestProcessingPolicy (void); private: RequestProcessingPolicy (const RequestProcessingPolicy &); @@ -1626,7 +1672,7 @@ TAO_NAMESPACE PortableServer class POAManager; typedef POAManager *POAManager_ptr; - + #endif /* end #if !defined */ @@ -1637,23 +1683,23 @@ TAO_NAMESPACE PortableServer { public: POAManager_var (void); // default constructor - POAManager_var (POAManager_ptr p) : ptr_ (p) {} + POAManager_var (POAManager_ptr p) : ptr_ (p) {} POAManager_var (const POAManager_var &); // copy constructor ~POAManager_var (void); // destructor - + POAManager_var &operator= (POAManager_ptr); POAManager_var &operator= (const POAManager_var &); POAManager_ptr operator-> (void) const; - + operator const POAManager_ptr &() const; operator POAManager_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn POAManager_ptr in (void) const; POAManager_ptr &inout (void); POAManager_ptr &out (void); POAManager_ptr _retn (void); POAManager_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static POAManager_ptr duplicate (POAManager_ptr); @@ -1661,7 +1707,7 @@ TAO_NAMESPACE PortableServer static POAManager_ptr nil (void); static POAManager_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: POAManager_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1688,7 +1734,7 @@ TAO_NAMESPACE PortableServer operator POAManager_ptr &(); POAManager_ptr &ptr (void); POAManager_ptr operator-> (void); - + private: POAManager_ptr &ptr_; }; @@ -1712,12 +1758,12 @@ TAO_NAMESPACE PortableServer static POAManager_ptr _duplicate (POAManager_ptr obj); static POAManager_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static POAManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static POAManager_ptr _nil (void) @@ -1735,27 +1781,27 @@ TAO_NAMESPACE PortableServer AdapterInactive (void); // Default constructor. - + AdapterInactive (const AdapterInactive &); // Copy constructor. - + ~AdapterInactive (void); // Destructor. - + AdapterInactive &operator= (const AdapterInactive &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static AdapterInactive *_downcast (CORBA::Exception *); @@ -1771,11 +1817,11 @@ TAO_NAMESPACE PortableServer HOLDING, ACTIVE, DISCARDING, - INACTIVE + INACTIVE }; typedef State &State_out; virtual void activate ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1787,7 +1833,7 @@ TAO_NAMESPACE PortableServer virtual void hold_requests ( CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1797,7 +1843,7 @@ TAO_NAMESPACE PortableServer virtual void discard_requests ( CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1808,7 +1854,7 @@ TAO_NAMESPACE PortableServer virtual void deactivate ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1819,7 +1865,7 @@ TAO_NAMESPACE PortableServer #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual PortableServer::POAManager::State get_state ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1827,12 +1873,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: POAManager (); - + virtual ~POAManager (void); private: POAManager (const POAManager &); @@ -1850,7 +1896,7 @@ TAO_NAMESPACE PortableServer class AdapterActivator; typedef AdapterActivator *AdapterActivator_ptr; - + #endif /* end #if !defined */ @@ -1861,23 +1907,23 @@ TAO_NAMESPACE PortableServer { public: AdapterActivator_var (void); // default constructor - AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {} + AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {} AdapterActivator_var (const AdapterActivator_var &); // copy constructor ~AdapterActivator_var (void); // destructor - + AdapterActivator_var &operator= (AdapterActivator_ptr); AdapterActivator_var &operator= (const AdapterActivator_var &); AdapterActivator_ptr operator-> (void) const; - + operator const AdapterActivator_ptr &() const; operator AdapterActivator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn AdapterActivator_ptr in (void) const; AdapterActivator_ptr &inout (void); AdapterActivator_ptr &out (void); AdapterActivator_ptr _retn (void); AdapterActivator_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static AdapterActivator_ptr duplicate (AdapterActivator_ptr); @@ -1885,7 +1931,7 @@ TAO_NAMESPACE PortableServer static AdapterActivator_ptr nil (void); static AdapterActivator_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: AdapterActivator_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1912,7 +1958,7 @@ TAO_NAMESPACE PortableServer operator AdapterActivator_ptr &(); AdapterActivator_ptr &ptr (void); AdapterActivator_ptr operator-> (void); - + private: AdapterActivator_ptr &ptr_; }; @@ -1936,12 +1982,12 @@ TAO_NAMESPACE PortableServer static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj); static AdapterActivator_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static AdapterActivator_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static AdapterActivator_ptr _nil (void) @@ -1952,7 +1998,7 @@ TAO_NAMESPACE PortableServer virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, const char * name, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1960,12 +2006,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: AdapterActivator (); - + virtual ~AdapterActivator (void); private: AdapterActivator (const AdapterActivator &); @@ -1981,7 +2027,7 @@ TAO_NAMESPACE PortableServer class ServantManager; typedef ServantManager *ServantManager_ptr; - + #endif /* end #if !defined */ @@ -1992,23 +2038,23 @@ TAO_NAMESPACE PortableServer { public: ServantManager_var (void); // default constructor - ServantManager_var (ServantManager_ptr p) : ptr_ (p) {} + ServantManager_var (ServantManager_ptr p) : ptr_ (p) {} ServantManager_var (const ServantManager_var &); // copy constructor ~ServantManager_var (void); // destructor - + ServantManager_var &operator= (ServantManager_ptr); ServantManager_var &operator= (const ServantManager_var &); ServantManager_ptr operator-> (void) const; - + operator const ServantManager_ptr &() const; operator ServantManager_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServantManager_ptr in (void) const; ServantManager_ptr &inout (void); ServantManager_ptr &out (void); ServantManager_ptr _retn (void); ServantManager_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ServantManager_ptr duplicate (ServantManager_ptr); @@ -2016,7 +2062,7 @@ TAO_NAMESPACE PortableServer static ServantManager_ptr nil (void); static ServantManager_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: ServantManager_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -2043,7 +2089,7 @@ TAO_NAMESPACE PortableServer operator ServantManager_ptr &(); ServantManager_ptr &ptr (void); ServantManager_ptr operator-> (void); - + private: ServantManager_ptr &ptr_; }; @@ -2067,12 +2113,12 @@ TAO_NAMESPACE PortableServer static ServantManager_ptr _duplicate (ServantManager_ptr obj); static ServantManager_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServantManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServantManager_ptr _nil (void) @@ -2081,12 +2127,12 @@ TAO_NAMESPACE PortableServer } virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ServantManager (); - + virtual ~ServantManager (void); private: ServantManager (const ServantManager &); @@ -2102,7 +2148,7 @@ TAO_NAMESPACE PortableServer class ServantActivator; typedef ServantActivator *ServantActivator_ptr; - + #endif /* end #if !defined */ @@ -2113,23 +2159,23 @@ TAO_NAMESPACE PortableServer { public: ServantActivator_var (void); // default constructor - ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {} + ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {} ServantActivator_var (const ServantActivator_var &); // copy constructor ~ServantActivator_var (void); // destructor - + ServantActivator_var &operator= (ServantActivator_ptr); ServantActivator_var &operator= (const ServantActivator_var &); ServantActivator_ptr operator-> (void) const; - + operator const ServantActivator_ptr &() const; operator ServantActivator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServantActivator_ptr in (void) const; ServantActivator_ptr &inout (void); ServantActivator_ptr &out (void); ServantActivator_ptr _retn (void); ServantActivator_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ServantActivator_ptr duplicate (ServantActivator_ptr); @@ -2137,7 +2183,7 @@ TAO_NAMESPACE PortableServer static ServantActivator_ptr nil (void); static ServantActivator_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: ServantActivator_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -2164,7 +2210,7 @@ TAO_NAMESPACE PortableServer operator ServantActivator_ptr &(); ServantActivator_ptr &ptr (void); ServantActivator_ptr operator-> (void); - + private: ServantActivator_ptr &ptr_; }; @@ -2188,12 +2234,12 @@ TAO_NAMESPACE PortableServer static ServantActivator_ptr _duplicate (ServantActivator_ptr obj); static ServantActivator_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServantActivator_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServantActivator_ptr _nil (void) @@ -2230,12 +2276,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ServantActivator (); - + virtual ~ServantActivator (void); private: ServantActivator (const ServantActivator &); @@ -2251,7 +2297,7 @@ TAO_NAMESPACE PortableServer class ServantLocator; typedef ServantLocator *ServantLocator_ptr; - + #endif /* end #if !defined */ @@ -2262,23 +2308,23 @@ TAO_NAMESPACE PortableServer { public: ServantLocator_var (void); // default constructor - ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {} + ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {} ServantLocator_var (const ServantLocator_var &); // copy constructor ~ServantLocator_var (void); // destructor - + ServantLocator_var &operator= (ServantLocator_ptr); ServantLocator_var &operator= (const ServantLocator_var &); ServantLocator_ptr operator-> (void) const; - + operator const ServantLocator_ptr &() const; operator ServantLocator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServantLocator_ptr in (void) const; ServantLocator_ptr &inout (void); ServantLocator_ptr &out (void); ServantLocator_ptr _retn (void); ServantLocator_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ServantLocator_ptr duplicate (ServantLocator_ptr); @@ -2286,7 +2332,7 @@ TAO_NAMESPACE PortableServer static ServantLocator_ptr nil (void); static ServantLocator_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: ServantLocator_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -2313,7 +2359,7 @@ TAO_NAMESPACE PortableServer operator ServantLocator_ptr &(); ServantLocator_ptr &ptr (void); ServantLocator_ptr operator-> (void); - + private: ServantLocator_ptr &ptr_; }; @@ -2340,12 +2386,12 @@ TAO_NAMESPACE PortableServer static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); static ServantLocator_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServantLocator_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServantLocator_ptr _nil (void) @@ -2384,12 +2430,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ServantLocator (); - + virtual ~ServantLocator (void); private: ServantLocator (const ServantLocator &); @@ -2417,12 +2463,12 @@ TAO_NAMESPACE PortableServer static POA_ptr _duplicate (POA_ptr obj); static POA_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static POA_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static POA_ptr _nil (void) @@ -2440,27 +2486,27 @@ TAO_NAMESPACE PortableServer AdapterAlreadyExists (void); // Default constructor. - + AdapterAlreadyExists (const AdapterAlreadyExists &); // Copy constructor. - + ~AdapterAlreadyExists (void); // Destructor. - + AdapterAlreadyExists &operator= (const AdapterAlreadyExists &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static AdapterAlreadyExists *_downcast (CORBA::Exception *); @@ -2481,27 +2527,27 @@ TAO_NAMESPACE PortableServer AdapterNonExistent (void); // Default constructor. - + AdapterNonExistent (const AdapterNonExistent &); // Copy constructor. - + ~AdapterNonExistent (void); // Destructor. - + AdapterNonExistent &operator= (const AdapterNonExistent &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static AdapterNonExistent *_downcast (CORBA::Exception *); @@ -2523,33 +2569,33 @@ TAO_NAMESPACE PortableServer InvalidPolicy (void); // Default constructor. - + InvalidPolicy (const InvalidPolicy &); // Copy constructor. - + ~InvalidPolicy (void); // Destructor. - + InvalidPolicy &operator= (const InvalidPolicy &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static InvalidPolicy *_downcast (CORBA::Exception *); InvalidPolicy ( CORBA::UShort _tao_index ); - + // = TAO extension. static CORBA::Exception *_alloc (void); }; // Exception PortableServer::POA::InvalidPolicy. @@ -2569,27 +2615,27 @@ TAO_NAMESPACE PortableServer NoServant (void); // Default constructor. - + NoServant (const NoServant &); // Copy constructor. - + ~NoServant (void); // Destructor. - + NoServant &operator= (const NoServant &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static NoServant *_downcast (CORBA::Exception *); @@ -2612,27 +2658,27 @@ TAO_NAMESPACE PortableServer ObjectAlreadyActive (void); // Default constructor. - + ObjectAlreadyActive (const ObjectAlreadyActive &); // Copy constructor. - + ~ObjectAlreadyActive (void); // Destructor. - + ObjectAlreadyActive &operator= (const ObjectAlreadyActive &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ObjectAlreadyActive *_downcast (CORBA::Exception *); @@ -2653,27 +2699,27 @@ TAO_NAMESPACE PortableServer ObjectNotActive (void); // Default constructor. - + ObjectNotActive (const ObjectNotActive &); // Copy constructor. - + ~ObjectNotActive (void); // Destructor. - + ObjectNotActive &operator= (const ObjectNotActive &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ObjectNotActive *_downcast (CORBA::Exception *); @@ -2694,27 +2740,27 @@ TAO_NAMESPACE PortableServer ServantAlreadyActive (void); // Default constructor. - + ServantAlreadyActive (const ServantAlreadyActive &); // Copy constructor. - + ~ServantAlreadyActive (void); // Destructor. - + ServantAlreadyActive &operator= (const ServantAlreadyActive &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ServantAlreadyActive *_downcast (CORBA::Exception *); @@ -2735,27 +2781,27 @@ TAO_NAMESPACE PortableServer ServantNotActive (void); // Default constructor. - + ServantNotActive (const ServantNotActive &); // Copy constructor. - + ~ServantNotActive (void); // Destructor. - + ServantNotActive &operator= (const ServantNotActive &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ServantNotActive *_downcast (CORBA::Exception *); @@ -2776,27 +2822,27 @@ TAO_NAMESPACE PortableServer WrongAdapter (void); // Default constructor. - + WrongAdapter (const WrongAdapter &); // Copy constructor. - + ~WrongAdapter (void); // Destructor. - + WrongAdapter &operator= (const WrongAdapter &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static WrongAdapter *_downcast (CORBA::Exception *); @@ -2817,27 +2863,27 @@ TAO_NAMESPACE PortableServer WrongPolicy (void); // Default constructor. - + WrongPolicy (const WrongPolicy &); // Copy constructor. - + ~WrongPolicy (void); // Destructor. - + WrongPolicy &operator= (const WrongPolicy &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static WrongPolicy *_downcast (CORBA::Exception *); @@ -2852,7 +2898,7 @@ TAO_NAMESPACE PortableServer const char * adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList & policies, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2864,7 +2910,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::POA_ptr find_POA ( const char * adapter_name, CORBA::Boolean activate_it, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2875,7 +2921,7 @@ TAO_NAMESPACE PortableServer virtual void destroy ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2886,7 +2932,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::ThreadPolicy_ptr create_thread_policy ( PortableServer::ThreadPolicyValue value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2897,7 +2943,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy ( PortableServer::LifespanPolicyValue value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2906,7 +2952,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( PortableServer::IdUniquenessPolicyValue value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2915,7 +2961,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( PortableServer::IdAssignmentPolicyValue value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2926,7 +2972,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( PortableServer::ImplicitActivationPolicyValue value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2935,7 +2981,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( PortableServer::ServantRetentionPolicyValue value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2944,7 +2990,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2954,7 +3000,7 @@ TAO_NAMESPACE PortableServer #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual char * the_name ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2962,7 +3008,7 @@ TAO_NAMESPACE PortableServer )) = 0; virtual PortableServer::POA_ptr the_parent ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2970,7 +3016,7 @@ TAO_NAMESPACE PortableServer )) = 0; virtual PortableServer::POAList * the_children ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2978,7 +3024,7 @@ TAO_NAMESPACE PortableServer )) = 0; virtual PortableServer::POAManager_ptr the_POAManager ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2988,7 +3034,7 @@ TAO_NAMESPACE PortableServer #if (TAO_HAS_MINIMUM_POA == 0) virtual PortableServer::AdapterActivator_ptr the_activator ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -2997,7 +3043,7 @@ TAO_NAMESPACE PortableServer virtual void the_activator ( PortableServer::AdapterActivator_ptr the_activator, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3005,7 +3051,7 @@ TAO_NAMESPACE PortableServer )) = 0; virtual PortableServer::ServantManager_ptr get_servant_manager ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3015,7 +3061,7 @@ TAO_NAMESPACE PortableServer virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3024,7 +3070,7 @@ TAO_NAMESPACE PortableServer )) = 0; virtual PortableServer::Servant get_servant ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3035,7 +3081,7 @@ TAO_NAMESPACE PortableServer virtual void set_servant ( PortableServer::Servant p_servant, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3047,7 +3093,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::ObjectId * activate_object ( PortableServer::Servant p_servant, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3059,7 +3105,7 @@ TAO_NAMESPACE PortableServer virtual void activate_object_with_id ( const PortableServer::ObjectId & id, PortableServer::Servant p_servant, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3071,7 +3117,7 @@ TAO_NAMESPACE PortableServer virtual void deactivate_object ( const PortableServer::ObjectId & oid, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3082,7 +3128,7 @@ TAO_NAMESPACE PortableServer virtual CORBA::Object_ptr create_reference ( const char * intf, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3093,7 +3139,7 @@ TAO_NAMESPACE PortableServer virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId & oid, const char * intf, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3103,7 +3149,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::ObjectId * servant_to_id ( PortableServer::Servant p_servant, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3114,7 +3160,7 @@ TAO_NAMESPACE PortableServer virtual CORBA::Object_ptr servant_to_reference ( PortableServer::Servant p_servant, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3125,7 +3171,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::Servant reference_to_servant ( CORBA::Object_ptr reference, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3137,7 +3183,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::ObjectId * reference_to_id ( CORBA::Object_ptr reference, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3148,7 +3194,7 @@ TAO_NAMESPACE PortableServer virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId & oid, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3159,7 +3205,7 @@ TAO_NAMESPACE PortableServer virtual CORBA::Object_ptr id_to_reference ( const PortableServer::ObjectId & oid, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3170,31 +3216,53 @@ TAO_NAMESPACE PortableServer virtual PortableServer::ObjectId * create_id_for_reference ( CORBA::Object_ptr the_ref, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )) = 0; virtual PortableServer::IDs * reference_to_ids ( CORBA::Object_ptr the_ref, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )) = 0; - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void associate_reference_with_id ( + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )) = 0; + virtual void disassociate_reference_with_id ( + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; protected: POA (); - + virtual ~POA (void); private: POA (const POA &); @@ -3210,7 +3278,7 @@ TAO_NAMESPACE PortableServer class Current; typedef Current *Current_ptr; - + #endif /* end #if !defined */ @@ -3221,23 +3289,23 @@ TAO_NAMESPACE PortableServer { public: Current_var (void); // default constructor - Current_var (Current_ptr p) : ptr_ (p) {} + Current_var (Current_ptr p) : ptr_ (p) {} Current_var (const Current_var &); // copy constructor ~Current_var (void); // destructor - + Current_var &operator= (Current_ptr); Current_var &operator= (const Current_var &); Current_ptr operator-> (void) const; - + operator const Current_ptr &() const; operator Current_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn Current_ptr in (void) const; Current_ptr &inout (void); Current_ptr &out (void); Current_ptr _retn (void); Current_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static Current_ptr duplicate (Current_ptr); @@ -3245,7 +3313,7 @@ TAO_NAMESPACE PortableServer static Current_ptr nil (void); static Current_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: Current_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -3272,7 +3340,7 @@ TAO_NAMESPACE PortableServer operator Current_ptr &(); Current_ptr &ptr (void); Current_ptr operator-> (void); - + private: Current_ptr &ptr_; }; @@ -3296,12 +3364,12 @@ TAO_NAMESPACE PortableServer static Current_ptr _duplicate (Current_ptr obj); static Current_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static Current_ptr _nil (void) @@ -3319,27 +3387,27 @@ TAO_NAMESPACE PortableServer NoContext (void); // Default constructor. - + NoContext (const NoContext &); // Copy constructor. - + ~NoContext (void); // Destructor. - + NoContext &operator= (const NoContext &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static NoContext *_downcast (CORBA::Exception *); @@ -3351,7 +3419,7 @@ TAO_NAMESPACE PortableServer #endif /* end #if !defined */ virtual PortableServer::POA_ptr get_POA ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3360,7 +3428,7 @@ TAO_NAMESPACE PortableServer )) = 0; virtual PortableServer::ObjectId * get_object_id ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -3369,12 +3437,12 @@ TAO_NAMESPACE PortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: Current (); - + virtual ~Current (void); private: Current (const Current &); @@ -3398,7 +3466,7 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Object TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&); -#if (TAO_HAS_MINIMAL_CORBA == 0) +#if (TAO_HAS_MINIMUM_CORBA == 0) TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version @@ -3407,6 +3475,10 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::NotAGroupObject *&); TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::IDs &); // copying version TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IDs*); // noncopying version TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IDs *&); // deprecated @@ -3461,6 +3533,10 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &); + + #if !defined _TAO_CDR_OP_PortableServer_IDs_H_ #define _TAO_CDR_OP_PortableServer_IDs_H_ @@ -3477,25 +3553,25 @@ TAO_PortableServer_Export CORBA::Boolean operator>> ( #if (TAO_HAS_MINIMUM_POA == 0) -TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); #endif /* TAO_HAS_MINIMUM_POA == 0 */ -TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &); -TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &); -TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &); #if (TAO_HAS_MINIMUM_POA == 0) -TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &); -TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &); -TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &); #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i index beddce7b123..396b4062009 100644 --- a/TAO/tao/PortableServer/PortableServerC.i +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -21,7 +21,7 @@ #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_) #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_ @@ -29,36 +29,36 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (CORBA::ULong nelems) { PortableServer::POA **buf = 0; - + ACE_NEW_RETURN (buf, PortableServer::POA*[nelems], 0); - + for (CORBA::ULong i = 0; i < nelems; i++) { buf[i] = PortableServer::POA::_nil (); } - + return buf; } - - ACE_INLINE void + + ACE_INLINE void PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (PortableServer::POA **buffer) { if (buffer == 0) return; delete[] buffer; } - + ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void) { } - + ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum) : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (maximum)) { } - + ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum, CORBA::ULong length, @@ -67,7 +67,7 @@ : TAO_Unbounded_Base_Sequence (maximum, length, value, release) { } - + ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList(const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs) : TAO_Unbounded_Base_Sequence (rhs) @@ -76,12 +76,12 @@ { PortableServer::POA **tmp1 = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_); PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < rhs.length_; ++i) { tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]); } - + this->buffer_ = tmp1; } else @@ -89,17 +89,17 @@ this->buffer_ = 0; } } - + ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList & PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator= (const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs) { if (this == &rhs) return *this; - + if (this->release_) { PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) { CORBA::release (tmp[i]); @@ -113,20 +113,20 @@ } else this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + PortableServer::POA **tmp1 = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_); PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < rhs.length_; ++i) { tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]); } - + return *this; } - + ACE_INLINE TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator[] (CORBA::ULong index) const // read-write accessor @@ -135,7 +135,7 @@ PortableServer::POA ** const tmp = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_); return TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> (tmp + index, this->release_); } - + ACE_INLINE PortableServer::POA* * PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (CORBA::Boolean orphan) { @@ -169,18 +169,18 @@ } return result; } - + ACE_INLINE const PortableServer::POA* * PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (void) const { return ACE_reinterpret_cast(const PortableServer::POA ** ACE_CAST_CONST, this->buffer_); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLESERVER_POALIST_CI_) #define _PORTABLESERVER_POALIST_CI_ @@ -236,7 +236,7 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p) { POAList *deep_copy = new POAList (*p.ptr_); - + if (deep_copy != 0) { POAList *tmp = deep_copy; @@ -246,7 +246,7 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p) } } } - + return *this; } @@ -262,27 +262,27 @@ PortableServer::POAList_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE PortableServer::POAList_var::operator const ::PortableServer::POAList &() const // cast { return *this->ptr_; } -ACE_INLINE -PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast +ACE_INLINE +PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast { return *this->ptr_; } -ACE_INLINE -PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast +ACE_INLINE +PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast +PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast { return this->ptr_; } @@ -305,7 +305,7 @@ PortableServer::POAList_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableServer::POAList *& PortableServer::POAList_var::out (void) { @@ -366,7 +366,7 @@ PortableServer::POAList_out::operator= (POAList *p) return *this; } -ACE_INLINE +ACE_INLINE PortableServer::POAList_out::operator ::PortableServer::POAList *&() // cast { return this->ptr_; @@ -455,7 +455,7 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p { ObjectId *deep_copy = new ObjectId (*p.ptr_); - + if (deep_copy != 0) { ObjectId *tmp = deep_copy; @@ -465,7 +465,7 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p } } } - + return *this; } @@ -493,20 +493,20 @@ PortableServer::ObjectId_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE PortableServer::ObjectId_var::operator const ::PortableServer::ObjectId &() const // cast { return *this->ptr_; } -ACE_INLINE -PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast +ACE_INLINE +PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast { return *this->ptr_; } -ACE_INLINE -PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast +ACE_INLINE +PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast { return *this->ptr_; } @@ -535,7 +535,7 @@ PortableServer::ObjectId_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableServer::ObjectId *& PortableServer::ObjectId_var::out (void) { @@ -596,7 +596,7 @@ PortableServer::ObjectId_out::operator= (ObjectId *p) return *this; } -ACE_INLINE +ACE_INLINE PortableServer::ObjectId_out::operator ::PortableServer::ObjectId *&() // cast { return this->ptr_; @@ -627,9 +627,13 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) // Inline operations for exception PortableServer::ForwardRequest // ************************************************************* +// ************************************************************* +// Inline operations for exception PortableServer::NotAGroupObject +// ************************************************************* + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CI_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CI_ @@ -642,24 +646,24 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) ACE_NEW_RETURN (retval, PortableServer::ObjectId[size], 0); return retval; } - + ACE_INLINE void PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (PortableServer::ObjectId *buffer) // Free the sequence. { delete [] buffer; } - + ACE_INLINE PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (void) // Default constructor. { } - + ACE_INLINE PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (maximum)) { } - + ACE_INLINE PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum, CORBA::ULong length, @@ -668,7 +672,7 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + ACE_INLINE PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs) // Copy constructor. @@ -678,10 +682,10 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) { PortableServer::ObjectId *tmp1 = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (this->maximum_); PortableServer::ObjectId * const tmp2 = ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -689,14 +693,14 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) this->buffer_ = 0; } } - + ACE_INLINE PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs & PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator= (const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -709,18 +713,18 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) } else this->buffer_ = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + PortableServer::ObjectId *tmp1 = ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_); PortableServer::ObjectId * const tmp2 = ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + // = Accessors. ACE_INLINE PortableServer::ObjectId & PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i) @@ -730,7 +734,7 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) PortableServer::ObjectId* tmp = ACE_reinterpret_cast(PortableServer::ObjectId*,this->buffer_); return tmp[i]; } - + ACE_INLINE const PortableServer::ObjectId & PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i) const // operator [] @@ -739,9 +743,9 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) PortableServer::ObjectId * const tmp = ACE_reinterpret_cast (PortableServer::ObjectId* ACE_CAST_CONST, this->buffer_); return tmp[i]; } - + // Implement the TAO_Base_Sequence methods (see Sequence.h) - + ACE_INLINE PortableServer::ObjectId * PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::get_buffer (CORBA::Boolean orphan) { @@ -775,13 +779,13 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) } return result; } - + ACE_INLINE const PortableServer::ObjectId * PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::get_buffer (void) const { return ACE_reinterpret_cast(const PortableServer::ObjectId * ACE_CAST_CONST, this->buffer_); } - + ACE_INLINE void PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::replace (CORBA::ULong max, CORBA::ULong length, @@ -798,11 +802,11 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index) this->buffer_ = data; this->release_ = release; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLESERVER_IDS_CI_) #define _PORTABLESERVER_IDS_CI_ @@ -858,7 +862,7 @@ PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p) { IDs *deep_copy = new IDs (*p.ptr_); - + if (deep_copy != 0) { IDs *tmp = deep_copy; @@ -868,7 +872,7 @@ PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p) } } } - + return *this; } @@ -884,27 +888,27 @@ PortableServer::IDs_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE PortableServer::IDs_var::operator const ::PortableServer::IDs &() const // cast { return *this->ptr_; } -ACE_INLINE -PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast +ACE_INLINE +PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast { return *this->ptr_; } -ACE_INLINE -PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast +ACE_INLINE +PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast +PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast { return this->ptr_; } @@ -933,7 +937,7 @@ PortableServer::IDs_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableServer::IDs *& PortableServer::IDs_var::out (void) { @@ -994,7 +998,7 @@ PortableServer::IDs_out::operator= (IDs *p) return *this; } -ACE_INLINE +ACE_INLINE PortableServer::IDs_out::operator ::PortableServer::IDs *&() // cast { return this->ptr_; @@ -1826,6 +1830,20 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::Forward return 0; } +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,PortableServer::NotAGroupObject&) +{ + return 1; +} + #if !defined _TAO_CDR_OP_PortableServer_IDs_I_ #define _TAO_CDR_OP_PortableServer_IDs_I_ @@ -1855,12 +1873,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Thread { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (PortableServer::ThreadPolicyValue, _tao_temp); } - + return _tao_result; } @@ -1876,12 +1894,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Lifesp { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (PortableServer::LifespanPolicyValue, _tao_temp); } - + return _tao_result; } @@ -1895,12 +1913,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniq { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (PortableServer::IdUniquenessPolicyValue, _tao_temp); } - + return _tao_result; } @@ -1914,12 +1932,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssi { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (PortableServer::IdAssignmentPolicyValue, _tao_temp); } - + return _tao_result; } @@ -1935,12 +1953,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Implic { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, _tao_temp); } - + return _tao_result; } @@ -1954,12 +1972,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Servan { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (PortableServer::ServantRetentionPolicyValue, _tao_temp); } - + return _tao_result; } @@ -1973,12 +1991,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Reques { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (PortableServer::RequestProcessingPolicyValue, _tao_temp); } - + return _tao_result; } diff --git a/TAO/tao/PortableServer/RTPortableServerC.cpp b/TAO/tao/PortableServer/RTPortableServerC.cpp index 22faf64e342..b8a97440933 100644 --- a/TAO/tao/PortableServer/RTPortableServerC.cpp +++ b/TAO/tao/PortableServer/RTPortableServerC.cpp @@ -21,12 +21,7 @@ #include "RTPortableServerC.h" -#include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/ClientRequestInfo.h" -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ +#if (TAO_HAS_RT_CORBA == 1) #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus @@ -36,49 +31,6 @@ #include "RTPortableServerC.i" #endif /* !defined INLINE */ -RTPortableServer::POA_ptr -tao_RTPortableServer_POA_duplicate ( - RTPortableServer::POA_ptr p - ) -{ - return RTPortableServer::POA::_duplicate (p); -} - -void -tao_RTPortableServer_POA_release ( - RTPortableServer::POA_ptr p - ) -{ - CORBA::release (p); -} - -RTPortableServer::POA_ptr -tao_RTPortableServer_POA_nil ( - void - ) -{ - return RTPortableServer::POA::_nil (); -} - -RTPortableServer::POA_ptr -tao_RTPortableServer_POA_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return RTPortableServer::POA::_narrow (p, ACE_TRY_ENV); -} - -CORBA::Object * -tao_RTPortableServer_POA_upcast ( - void *src - ) -{ - RTPortableServer::POA **tmp = - ACE_static_cast (RTPortableServer::POA **, src); - return *tmp; -} - // ************************************************************* // Operations for class RTPortableServer::POA_var // ************************************************************* @@ -127,7 +79,7 @@ RTPortableServer::POA_var::operator const ::RTPortableServer::POA_ptr &() const return this->ptr_; } -RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast +RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast { return this->ptr_; } @@ -331,7 +283,7 @@ void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -349,3 +301,4 @@ const char* RTPortableServer::POA::_interface_repository_id (void) const # pragma instantiate TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/PortableServer/RTPortableServerC.h b/TAO/tao/PortableServer/RTPortableServerC.h index a7302fe4d3c..a7c2c357441 100644 --- a/TAO/tao/PortableServer/RTPortableServerC.h +++ b/TAO/tao/PortableServer/RTPortableServerC.h @@ -23,13 +23,14 @@ #define _TAO_IDL_RTPORTABLESERVERC_H_ #include "ace/pre.h" -#include "tao/corba.h" +#include "PortableServerC.h" + +#if (TAO_HAS_RT_CORBA == 1) #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PortableServerC.h" #include "tao/RTCORBAC.h" #if defined (TAO_EXPORT_MACRO) @@ -63,7 +64,7 @@ TAO_NAMESPACE RTPortableServer class POA; typedef POA *POA_ptr; - + #endif /* end #if !defined */ @@ -74,23 +75,23 @@ TAO_NAMESPACE RTPortableServer { public: POA_var (void); // default constructor - POA_var (POA_ptr p) : ptr_ (p) {} + POA_var (POA_ptr p) : ptr_ (p) {} POA_var (const POA_var &); // copy constructor ~POA_var (void); // destructor - + POA_var &operator= (POA_ptr); POA_var &operator= (const POA_var &); POA_ptr operator-> (void) const; - + operator const POA_ptr &() const; operator POA_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn POA_ptr in (void) const; POA_ptr &inout (void); POA_ptr &out (void); POA_ptr _retn (void); POA_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static POA_ptr duplicate (POA_ptr); @@ -98,7 +99,7 @@ TAO_NAMESPACE RTPortableServer static POA_ptr nil (void); static POA_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: POA_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -125,7 +126,7 @@ TAO_NAMESPACE RTPortableServer operator POA_ptr &(); POA_ptr &ptr (void); POA_ptr operator-> (void); - + private: POA_ptr &ptr_; }; @@ -149,12 +150,12 @@ TAO_NAMESPACE RTPortableServer static POA_ptr _duplicate (POA_ptr obj); static POA_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static POA_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static POA_ptr _nil (void) @@ -165,7 +166,7 @@ TAO_NAMESPACE RTPortableServer virtual CORBA::Object_ptr create_reference_with_priority ( const char * intf, RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -177,7 +178,7 @@ TAO_NAMESPACE RTPortableServer const PortableServer::ObjectId & oid, const char * intf, RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -188,7 +189,7 @@ TAO_NAMESPACE RTPortableServer virtual PortableServer::ObjectId * activate_object_with_priority ( PortableServer::Servant p_servant, RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -201,7 +202,7 @@ TAO_NAMESPACE RTPortableServer const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -212,12 +213,12 @@ TAO_NAMESPACE RTPortableServer )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: POA (); - + virtual ~POA (void); private: POA (const POA &); @@ -250,5 +251,7 @@ TAO_NAMESPACE_CLOSE // module RTPortableServer #pragma option pop #endif /* __BORLANDC__ */ +#endif /* TAO_HAS_RT_CORBA */ + #include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tests/Miop/Makefile b/TAO/tests/Miop/Makefile new file mode 100644 index 00000000000..e546515a536 --- /dev/null +++ b/TAO/tests/Miop/Makefile @@ -0,0 +1,914 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +IDL_FILES = test +IDL_SRC = testC.cpp testS.cpp +BIN_UNCHECKED = server client + +SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC) + +CLIENT_OBJS = client.o testC.o +SERVER_OBJS = server.o $(IDL_SRC:.cpp=.o) + +BUILD = $(BIN) +TAO_SRVR_LIBS = $(LDLIBS:%=%$(VAR)) +VBIN = $(BIN:%=%$(VAR)) +TAO_IDLFLAGS += -Ge 1 + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU + +ifeq ($(rt_corba),1) +BIN=$(BIN_UNCHECKED) +endif # rt_corba + +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk + +TAO_SRVR_LIBS := -lTAO_Strategies $(TAO_SRVR_LIBS) +TAO_CLNT_LIBS := -lTAO_Strategies $(TAO_CLNT_LIBS) + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext)) + +server: $(addprefix $(VDIR),$(SERVER_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +client: $(addprefix $(VDIR),$(CLIENT_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) + +realclean: clean + -$(RM) $(foreach ext, $(IDL_EXT), test$(ext)) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp testS.h testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + testS_T.h testS_T.cpp testS_T.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(TAO_ROOT)/tao/Strategies/advanced_resource.h \ + $(TAO_ROOT)/tao/Strategies/strategies_export.h \ + $(TAO_ROOT)/tao/default_resource.h + +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Sched_Params.h \ + $(TAO_ROOT)/tao/Strategies/advanced_resource.h \ + $(TAO_ROOT)/tao/Strategies/strategies_export.h \ + $(TAO_ROOT)/tao/default_resource.h + +.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + testC.i + +.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + testS_T.h testS_T.cpp testS_T.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + testS.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Miop/Makefile.bor b/TAO/tests/Miop/Makefile.bor new file mode 100644 index 00000000000..1388c960ecf --- /dev/null +++ b/TAO/tests/Miop/Makefile.bor @@ -0,0 +1,7 @@ +# +# Makefile for building the Client_Propagated test executables +# + +MAKEFILES = server.bor client.bor + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Miop/README b/TAO/tests/Miop/README new file mode 100644 index 00000000000..1279b901967 --- /dev/null +++ b/TAO/tests/Miop/README @@ -0,0 +1,50 @@ +$Id$ + +This is a unit test for RTCORBA::CLIENT_PROPAGATED priority model. + +Scenario: +-------- + +Server creates a POA with RTCORBA::CLIENT_PROPAGATED priority model +policy and registers a servant with it. Client obtains the object +reference and verifies that it does have the RTCORBA::CLIENT_PROPAGATED +priority model set. Client then performs several invocations on the +object, changing the priority of its thread before each. The client +also passes its thread priority as an argument to each operation. +For each invocation, the servant checks that it's thread priority is +equivalent to the priority of the invoking client thread, which we know +from the operation argument. In addition, the server verifies that +it's starting thread priority (before entering ORB event loop) is the +same as it's ending thread priority (ater ORB shutdown), to insure +that the thread servicing the requests at client propagated priority +is always returned to its original priority. + +To run (on Unix): +------- +$./server +$./client + +Options: +-------- +server [-o ior_output_file] +client [-k server_ior] + +Expected output: +---------------- +Client executable produces no output (unless there are errors). +Server should produces the following if there are no errors (the +priority numbers may differ from platform to platform): + +$server +Activated as <IOR:010000000d00000049444c3a546573743a312e300000000001000000000000 +00a6000000010102cd15000000636f727269646f2e63732e777573746c2e65647500cde304230000 +0014010f004e5354c5c9a539bd0105000100000001000000000000000100000001000000cd040000 +00000000000800000001cdcdcd004f4154010000001400000001cdcdcd0100010000000000090101 +0000000000004f41540400000001cd0000020000001a00000001cdcdcd01000000020041540a0000 +0001cdcdcd000000000000> + +Client priority: 0 Servant thread priority: 0 +Client priority: 1 Servant thread priority: 1 +Client priority: 2 Servant thread priority: 2 +Server ORB event loop finished +Final priority of the servant thread = its initial priority diff --git a/TAO/tests/Miop/client.cpp b/TAO/tests/Miop/client.cpp new file mode 100644 index 00000000000..c72aceea2cf --- /dev/null +++ b/TAO/tests/Miop/client.cpp @@ -0,0 +1,94 @@ +// $Id$ + +#include "testC.h" +#include "ace/Get_Opt.h" + +const char *ior = "file://test.ior"; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "k:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.optarg; + break; + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + // Initialize and obtain reference to the Test object. + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var object = + orb->string_to_object (ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Test_var server = + Test::_narrow (object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (server.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "ERROR: Object reference <%s> is nil\n", + ior), + 1); + } + + // Send a request. + server->test_method (1, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#if 1 + // Send a big request. + int num_longs = 1700; + Test::long_seq input (num_longs); + input.length (num_longs); + + for(int i=0;i<num_longs;i++) + input[i]=i; + + server->test_long_sequence (input, + ACE_TRY_ENV); + ACE_TRY_CHECK; +#endif + + // Shut down Server ORB. + server->shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Caught exception:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} + diff --git a/TAO/tests/Miop/client.dsp b/TAO/tests/Miop/client.dsp new file mode 100644 index 00000000000..c401640c928 --- /dev/null +++ b/TAO/tests/Miop/client.dsp @@ -0,0 +1,204 @@ +# Microsoft Developer Studio Project File - Name="Miop Client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Miop Client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak" CFG="Miop Client - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Miop Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Miop Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Miop Client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "Miop Client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\Strategies" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Miop Client - Win32 Release"
+# Name "Miop Client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF "$(CFG)" == "Miop Client - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Miop Client - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/Miop/run_test.pl b/TAO/tests/Miop/run_test.pl new file mode 100644 index 00000000000..36f3155daef --- /dev/null +++ b/TAO/tests/Miop/run_test.pl @@ -0,0 +1,46 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../../bin'; +use PerlACE::Run_Test; + +$status = 0; + +$iorfile = PerlACE::LocalFile ("test.ior"); + +unlink $iorfile; + +print STDERR "\n RTCORBA CLIENT_PROPAGATED Priority Unit Test\n\n"; + +$SV = new PerlACE::Process ("server", "-o $iorfile"); +$CL = new PerlACE::Process ("client", "-k file://$iorfile"); + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; +} + +$client = $CL->SpawnWaitKill (60); + +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +$server = $SV->WaitKill (60); + +if ($server !=0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +unlink $iorfile; + +exit $status; diff --git a/TAO/tests/Miop/server.cpp b/TAO/tests/Miop/server.cpp new file mode 100644 index 00000000000..80f7ebc4668 --- /dev/null +++ b/TAO/tests/Miop/server.cpp @@ -0,0 +1,309 @@ +// $Id$ + +#include "testS.h" +#include "tao/PortableGroup/miopC.h" +#include "tao/PortableGroup/PortableGroupC.h" +#include "ace/Get_Opt.h" + +class Test_i : public POA_Test +{ + // = TITLE + // An implementation for the Test interface in test.idl + // +public: + Test_i (CORBA::ORB_ptr orb, int i); + // ctor + + // = The Test methods. + void test_method (CORBA::Short priority, + CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)); + + void shutdown (CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)); + + void test_long_sequence (const Test::long_seq & input, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + // The ORB. + CORBA::ORB_var orb_; + + // The instance number. + int instance_; +}; + +Test_i::Test_i (CORBA::ORB_ptr orb, int i) + : orb_ (CORBA::ORB::_duplicate (orb)), + instance_ (i) +{ +} + +void +Test_i::test_method (CORBA::Short priority, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_DEBUG ((LM_DEBUG, "Hello from instance <%d>. Got %d\n", + this->instance_, + priority)); +} + +void +Test_i::test_long_sequence (const Test::long_seq & input, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_DEBUG ((LM_DEBUG, "Hello from instance <%d>. Got long sequence\n", + this->instance_)); +} + +void +Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->orb_->shutdown (0, ACE_TRY_ENV); +} + +//************************************************************************* + +const char *ior_output_file = "test.ior"; + +// Parse command-line arguments. +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "o:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.optarg; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + // Standard initialization: + // parse arguments and get all the references (ORB, + // RootPOA, RTORB, RTCurrent, POAManager). + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var MIOP = + orb->resolve_initial_references (TAO_OBJID_MIOP, + 0, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + MIOP::MulticastObjectGroupFactory_var mogf = + MIOP::MulticastObjectGroupFactory::_narrow (MIOP.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Create an instance of our servant. + Test_i server_impl (orb.in (), 0); + +#if 1 + // Create a multicast group IOR + CORBA::Octet class_d_address[4]={225,1,1,1}; + + CORBA::Object_var group1 = mogf->create_group (server_impl._interface_repository_id (), + class_d_address, + 1234, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Print Object IOR. + CORBA::String_var ior = + orb->object_to_string (group1.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +#else + CORBA::String_var ior = CORBA::string_dup ("corbaloc:miop:1.0@1.0-MyLittleDomain-1/225.1.1.8:5000"); + CORBA::Object_var group1 = orb->string_to_object (ior, ACE_TRY_ENV); + ACE_TRY_CHECK; +#endif + + ACE_DEBUG ((LM_DEBUG, "group1's IOR is <%s>\n\n", ior.in ())); + + if (ior_output_file != 0) + { + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + } + + CORBA::Object_var object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::ObjectId_var id = + root_poa->create_id_for_reference (group1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + root_poa->activate_object_with_id (id, &server_impl, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#if 0 + // Create a second servant for the same group + Test_i server_impl2 (orb.in (), 1); + + PortableServer::ObjectId_var id2 = + root_poa->create_id_for_reference (group1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + root_poa->activate_object_with_id (id2, &server_impl2, ACE_TRY_ENV); + ACE_TRY_CHECK; +#endif + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Run ORB Event loop. + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); + + +#if 0 + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + object = orb->resolve_initial_references ("RTORB", ACE_TRY_ENV); + ACE_TRY_CHECK; + RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + object = + orb->resolve_initial_references ("RTCurrent", ACE_TRY_ENV); + ACE_TRY_CHECK; + RTCORBA::Current_var current = + RTCORBA::Current::_narrow (object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Create POA with CLIENT_PROPAGATED PriorityModelPolicy, + // and register Test object with it. + CORBA::PolicyList poa_policy_list; + poa_policy_list.length (1); + poa_policy_list[0] = + rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, + 0, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POA_var child_poa = + root_poa->create_POA ("Child_POA", + poa_manager.in (), + poa_policy_list, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + Test_i server_impl (orb.in ()); + + PortableServer::ObjectId_var id = + child_poa->activate_object (&server_impl, ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var server = + child_poa->id_to_reference (id.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Print Object IOR. + CORBA::String_var ior = + orb->object_to_string (server.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ())); + + if (ior_output_file != 0) + { + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + } + + // Get the initial priority of the current thread. + CORBA::Short initial_thread_priority = + current->the_priority (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Run ORB Event loop. + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n")); + + // Get the final priority of the current thread. + CORBA::Short final_thread_priority = + current->the_priority (ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (final_thread_priority != initial_thread_priority) + ACE_DEBUG ((LM_DEBUG, + "ERROR: Priority of the servant thread" + "has been permanently changed!\n" + "Initial priority: %d Final priority: %d\n", + initial_thread_priority, final_thread_priority)); + else + ACE_DEBUG ((LM_DEBUG, + "Final priority of the servant thread" + " = its initial priority\n")); +#endif + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} + diff --git a/TAO/tests/Miop/server.dsp b/TAO/tests/Miop/server.dsp new file mode 100644 index 00000000000..a709ef36eee --- /dev/null +++ b/TAO/tests/Miop/server.dsp @@ -0,0 +1,216 @@ +# Microsoft Developer Studio Project File - Name="Miop Server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Miop Server - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak" CFG="Miop Server - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Miop Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Miop Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Miop Server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "Miop Server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\..\\" /I "..\..\..\\" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 TAO_PortableGroupd.lib TAO_PortableServerd.lib TAOd.lib aced.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableGroup" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Miop Server - Win32 Release"
+# Name "Miop Server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF "$(CFG)" == "Miop Server - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Miop Server - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/Miop/svc.conf b/TAO/tests/Miop/svc.conf new file mode 100644 index 00000000000..bd1c190f3a3 --- /dev/null +++ b/TAO/tests/Miop/svc.conf @@ -0,0 +1,3 @@ +dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "" +static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory" +#static PortableGroup_Loader "-MIOPDomainId MyDomain" diff --git a/TAO/tests/Miop/test.idl b/TAO/tests/Miop/test.idl new file mode 100644 index 00000000000..59aa8d6cb92 --- /dev/null +++ b/TAO/tests/Miop/test.idl @@ -0,0 +1,14 @@ +// +// $Id$ +// + +interface Test +{ + oneway void test_method (in short arg); + + typedef sequence<long> long_seq; + oneway void test_long_sequence (in long_seq input); + + // Shut down the ORB. + oneway void shutdown (); +}; diff --git a/TAO/utils/NamingViewer/NamingViewer.rc b/TAO/utils/NamingViewer/NamingViewer.rc index 7f85193a752..bb2dad66b9c 100644 --- a/TAO/utils/NamingViewer/NamingViewer.rc +++ b/TAO/utils/NamingViewer/NamingViewer.rc @@ -1,355 +1,710 @@ //Microsoft Developer Studio generated resource script. + // + #include "resource.h" + + #define APSTUDIO_READONLY_SYMBOLS + ///////////////////////////////////////////////////////////////////////////// + // + // Generated from the TEXTINCLUDE 2 resource. + // + #include "afxres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS + + ///////////////////////////////////////////////////////////////////////////// + // English (U.S.) resources + + #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) + #ifdef _WIN32 + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + #pragma code_page(1252) + #endif //_WIN32 + + #ifdef APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// + // + // TEXTINCLUDE + // + + 1 TEXTINCLUDE DISCARDABLE + BEGIN + "resource.h\0" + END + + 2 TEXTINCLUDE DISCARDABLE + BEGIN + "#include ""afxres.h""\r\n" + "\0" + END + + 3 TEXTINCLUDE DISCARDABLE + BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "#ifdef _WIN32\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#endif //_WIN32\r\n" + "#include ""res\\NamingViewer.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#endif\r\n" + "\0" + END + + #endif // APSTUDIO_INVOKED + + + ///////////////////////////////////////////////////////////////////////////// + // + // Icon + // + + // Icon with lowest ID value placed first to ensure application icon + // remains consistent on all systems. + IDR_MAINFRAME ICON DISCARDABLE "res\\NamingViewer.ico" + + ///////////////////////////////////////////////////////////////////////////// + // + // Dialog + // + + IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 62 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "About NamingViewer" + FONT 8, "MS Sans Serif" + BEGIN + ICON IDR_MAINFRAME,IDC_STATIC,11,17,21,20 + LTEXT "NamingViewer Version 1.0",IDC_STATIC,40,10,119,8, + SS_NOPREFIX + LTEXT "Copyright (C) 1999",IDC_STATIC,40,25,119,8 + DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP + LTEXT "Author: Chris Hafey (chris@stentorsoft.com)",IDC_STATIC, + 40,41,138,8 + END + + IDD_NAMINGVIEWER_DIALOG DIALOGEX 0, 0, 248, 198 + STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME + EXSTYLE WS_EX_APPWINDOW + CAPTION "NamingViewer" + FONT 8, "MS Sans Serif" + BEGIN + CONTROL "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | + TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, + 7,42,234,149 + GROUPBOX "Name Server",IDC_NS,7,7,234,30 + PUSHBUTTON "Select",IDC_SELECT_NS,184,18,50,12 + EDITTEXT IDC_SERVER,13,18,158,12,ES_AUTOHSCROLL | ES_READONLY + END + + IDD_VIEWIOR_DIALOG DIALOG DISCARDABLE 0, 0, 399, 127 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "View IOR" + FONT 8, "MS Sans Serif" + BEGIN + PUSHBUTTON "OK",IDOK,342,26,50,14 + LTEXT "IOR:",IDC_STATIC,7,9,16,8 + EDITTEXT IDC_IOR,27,7,304,12,ES_AUTOHSCROLL + LTEXT "Repository ID:",IDC_STATIC,7,30,46,8 + EDITTEXT IDC_TYPE_ID,57,27,274,12,ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "Apply",IDC_APPLY,342,7,50,14 + CONTROL "Tree1",IDC_PROFILES,"SysTreeView32",TVS_HASBUTTONS | + TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, + 7,49,385,70 + END + + IDD_BIND DIALOG DISCARDABLE 0, 0, 279, 66 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Bind Object/Context" + FONT 8, "MS Sans Serif" + BEGIN + DEFPUSHBUTTON "OK",IDOK,77,45,50,14 + PUSHBUTTON "Cancel",IDCANCEL,152,45,50,14 + LTEXT "Id:",IDC_STATIC,7,9,9,8 + EDITTEXT IDC_ID,35,7,115,12,ES_AUTOHSCROLL + LTEXT "Kind:",IDC_STATIC,163,9,17,8 + LTEXT "IOR:",IDC_STATIC,7,28,22,8 + EDITTEXT IDC_IOR,35,26,174,12,ES_AUTOHSCROLL + EDITTEXT IDC_KIND,185,7,87,12,ES_AUTOHSCROLL + PUSHBUTTON "View IOR",IDC_VIEWIOR,222,26,50,12 + END + + IDD_BIND_NEW_CONTEXT DIALOG DISCARDABLE 0, 0, 159, 76 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Bind New Context" + FONT 8, "MS Sans Serif" + BEGIN + EDITTEXT IDC_ID,27,7,125,12,ES_AUTOHSCROLL + EDITTEXT IDC_KIND,27,31,125,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,18,55,50,14 + PUSHBUTTON "Cancel",IDCANCEL,91,55,50,14 + LTEXT "Id:",IDC_STATIC,7,10,16,8 + LTEXT "Kind:",IDC_STATIC,7,34,17,8 + END + + IDD_SELECT_NS DIALOG DISCARDABLE 0, 0, 186, 94 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Select Naming Service" + FONT 8, "MS Sans Serif" + BEGIN + LISTBOX IDC_SERVERS,7,7,107,80,LBS_SORT | LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Add",IDC_ADD,129,29,50,14 + PUSHBUTTON "Remove",IDC_REMOVE,129,51,50,14 + PUSHBUTTON "Cancel",IDCANCEL,129,73,50,14 + END + + IDD_ADD_NAME_SERVER DIALOG DISCARDABLE 0, 0, 186, 69 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Add Name Server" + FONT 8, "MS Sans Serif" + BEGIN + DEFPUSHBUTTON "OK",IDOK,26,48,50,14 + PUSHBUTTON "Cancel",IDCANCEL,109,48,50,14 + LTEXT "Name:",IDC_STATIC,7,10,22,8 + LTEXT "IOR:",IDC_STATIC,7,30,24,8 + EDITTEXT IDC_NAME,36,7,143,12,ES_AUTOHSCROLL + EDITTEXT IDC_IOR,37,27,142,12,ES_AUTOHSCROLL + END + + + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL + #ifdef _DEBUG + FILEFLAGS 0x1L + #else + FILEFLAGS 0x0L + #endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "NamingViewer MFC Application\0" + VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "InternalName", "NamingViewer\0" + VALUE "LegalCopyright", "Copyright (C) 1999\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "NamingViewer.EXE\0" + VALUE "ProductName", "NamingViewer Application\0" + VALUE "ProductVersion", "1, 0, 0, 1\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END + + #endif // !_MAC + + + ///////////////////////////////////////////////////////////////////////////// + // + // DESIGNINFO + // + + #ifdef APSTUDIO_INVOKED + GUIDELINES DESIGNINFO DISCARDABLE + BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 228 + TOPMARGIN, 7 + BOTTOMMARGIN, 55 + END + + IDD_NAMINGVIEWER_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 241 + TOPMARGIN, 7 + BOTTOMMARGIN, 191 + END + + IDD_VIEWIOR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 392 + TOPMARGIN, 7 + BOTTOMMARGIN, 120 + END + + IDD_BIND, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 272 + TOPMARGIN, 7 + BOTTOMMARGIN, 59 + END + + IDD_BIND_NEW_CONTEXT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 152 + TOPMARGIN, 7 + BOTTOMMARGIN, 69 + END + + IDD_SELECT_NS, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 87 + END + + IDD_ADD_NAME_SERVER, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 62 + END + END + #endif // APSTUDIO_INVOKED + + + ///////////////////////////////////////////////////////////////////////////// + // + // Menu + // + + IDR_CONTEXT_POPUP MENU DISCARDABLE + BEGIN + POPUP "Context_Popup" + BEGIN + MENUITEM "Bind Context", ID_CONTEXT_POPUP_BIND_CONTEXT + + MENUITEM "Bind New Context", ID_CONTEXTPOPUP_BINDNEWCONTEXT + + MENUITEM "Bind Object", ID_CONTEXT_POPUP_BINDOBJECT + MENUITEM "Unbind", ID_CONTEXT_POPUP_UNBIND + MENUITEM "Destroy", ID_CONTEXT_POPUP_DESTROY + MENUITEM "View Reference", ID_CONTEXT_POPUP_VIEWREFERENCE + + MENUITEM "Refresh", ID_CONTEXT_POPUP_REFRESH + END + END + + IDR_OBJECT_POPUP MENU DISCARDABLE + BEGIN + POPUP "Object_Popup" + BEGIN + MENUITEM "Unbind", ID_OBJECTPOPUP_UNBIND + MENUITEM "View Refrence", ID_OBJECTPOPUP_VIEWREFRENCE + END + END + + + ///////////////////////////////////////////////////////////////////////////// + // + // String Table + // + + STRINGTABLE DISCARDABLE + BEGIN + IDS_ABOUTBOX "&About NamingViewer..." + END + + #endif // English (U.S.) resources + ///////////////////////////////////////////////////////////////////////////// + + + + #ifndef APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// + // + // Generated from the TEXTINCLUDE 3 resource. + // + #define _AFX_NO_SPLITTER_RESOURCES + #define _AFX_NO_OLE_RESOURCES + #define _AFX_NO_TRACKER_RESOURCES + #define _AFX_NO_PROPERTY_RESOURCES + + #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) + #ifdef _WIN32 + LANGUAGE 9, 1 + #pragma code_page(1252) + #endif //_WIN32 + #include "res\NamingViewer.rc2" // non-Microsoft Visual C++ edited resources + #include "afxres.rc" // Standard components + #endif + + ///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED + + diff --git a/TAO/utils/NamingViewer/res/NamingViewer.rc2 b/TAO/utils/NamingViewer/res/NamingViewer.rc2 index 196a5f10a56..0e6faae8bd2 100644 --- a/TAO/utils/NamingViewer/res/NamingViewer.rc2 +++ b/TAO/utils/NamingViewer/res/NamingViewer.rc2 @@ -1,13 +1,26 @@ // + // NAMINGVIEWER.RC2 - resources Microsoft Visual C++ does not edit directly + // + + #ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ + #endif //APSTUDIO_INVOKED + + + ///////////////////////////////////////////////////////////////////////////// + // Add manually edited resources here... + + ///////////////////////////////////////////////////////////////////////////// + diff --git a/TAO/utils/catior/test.bat b/TAO/utils/catior/test.bat index 0452ffbdfce..85310c16fc5 100644 --- a/TAO/utils/catior/test.bat +++ b/TAO/utils/catior/test.bat @@ -1,6 +1,12 @@ catior -f .\test\EventService.ior + catior -f .\test\test1.ior + catior -f .\test\test2.ior + catior -f .\test\timeserver.ior + catior -f .\test\timeserver.iiop + catior -f .\test\param_test.iiop + diff --git a/TAO/utils/catior/test/adagrid.ior b/TAO/utils/catior/test/adagrid.ior index 5b411a78853..3ce4e538f6c 100644 --- a/TAO/utils/catior/test/adagrid.ior +++ b/TAO/utils/catior/test/adagrid.ior @@ -1,2 +1,3 @@ IOR:000000000000000D49444C3A677269643A312E30000E7E4A00000001000000000000003200010000000000056A696D690000EA610000001EB54160B6B541646147726964537276B5424F41B541646147726964537276 + diff --git a/TAO/utils/catior/test/expersoft.iiop b/TAO/utils/catior/test/expersoft.iiop index c4909570633..7fb848d5bd9 100644 --- a/TAO/utils/catior/test/expersoft.iiop +++ b/TAO/utils/catior/test/expersoft.iiop @@ -1,2 +1,4 @@ iiop://millenium:5555/NameServiceRoot + + diff --git a/TAO/utils/catior/test/expersoft2.iiop b/TAO/utils/catior/test/expersoft2.iiop index 87cd37a572e..ea24d7c80dd 100644 --- a/TAO/utils/catior/test/expersoft2.iiop +++ b/TAO/utils/catior/test/expersoft2.iiop @@ -1,2 +1,4 @@ iiop://legend:5555/NameServiceRoot + + diff --git a/TAO/utils/catior/test/expersoft3.iiop b/TAO/utils/catior/test/expersoft3.iiop index 715213b3f93..37cc0bb0305 100644 --- a/TAO/utils/catior/test/expersoft3.iiop +++ b/TAO/utils/catior/test/expersoft3.iiop @@ -1,2 +1,4 @@ iiop://boris:5555/NameServiceRoot + + diff --git a/TAO/utils/catior/test/namingservice.poop b/TAO/utils/catior/test/namingservice.poop index 060222390a7..4b79e7c47bb 100644 --- a/TAO/utils/catior/test/namingservice.poop +++ b/TAO/utils/catior/test/namingservice.poop @@ -1,2 +1,4 @@ :\ntlj3corba:NS:NC_2::IR:CosNaming_NamingContext + + |