diff options
| author | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-05 00:18:50 +0000 |
|---|---|---|
| committer | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-05 00:18:50 +0000 |
| commit | d7f4d013a7948350ccb465b3867d47c4abed4693 (patch) | |
| tree | 4efc141174b56973f6226e4873b7ed024d063ae0 /TAO | |
| parent | 62a20cba69dfc10911d6a2e38ca30bf87ee379fd (diff) | |
| download | ATCD-d7f4d013a7948350ccb465b3867d47c4abed4693.tar.gz | |
ChangeLogTag:Mon Dec 4 18:11:01 2000 Marina Spivak <marina@cs.wustl.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.cpp | 15 | ||||
| -rw-r--r-- | TAO/tao/Strategies/UIOP_Acceptor.cpp | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 00677dfd4f7..0a174f1fef4 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Mon Dec 4 18:11:01 2000 Marina Spivak <marina@cs.wustl.edu> + + * tao/IIOP_Acceptor.cpp + * tao/Strategies/UIOP_Acceptor.cpp: + + Fixed comments. + Mon Dec 4 17:36:22 2000 Marina Spivak <marina@cs.wustl.edu> * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 8bb79ca248c..7903b04ed0d 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -107,7 +107,6 @@ TAO_IIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key, // Create a profile for each acceptor endpoint. for (size_t i = 0; i < this->endpoint_count_; ++i) { - // @@ Use autopointer here. TAO_IIOP_Profile *pfile = 0; ACE_NEW_RETURN (pfile, TAO_IIOP_Profile (this->hosts_[i], @@ -160,7 +159,7 @@ TAO_IIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, iiop_profile = ACE_dynamic_cast (TAO_IIOP_Profile *, pfile); break; - } + } } // If <mprofile> doesn't contain a IIOP_Profile, we need to create @@ -183,11 +182,11 @@ TAO_IIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, iiop_profile = 0; return -1; } - + if (this->orb_core_->orb_params ()->std_profile_components () != 0) { iiop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE); - + CONV_FRAME::CodeSetComponentInfo code_set_info; code_set_info.ForCharData.native_code_set = TAO_DEFAULT_CHAR_CODESET_ID; @@ -200,8 +199,8 @@ TAO_IIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, } // Add any remaining acceptor endpoints to the IIOP_Profile. - for (; - index < this->endpoint_count_; + for (; + index < this->endpoint_count_; ++index) { TAO_IIOP_Endpoint *endpoint = 0; @@ -212,8 +211,8 @@ TAO_IIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, -1); endpoint->priority (this->priority_); iiop_profile->add_endpoint (endpoint); - } - + } + return 0; } diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 05476fdd171..26ba97c1ac3 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -152,7 +152,7 @@ TAO_UIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, TAO_Profile *pfile = 0; TAO_UIOP_Profile *uiop_profile = 0; - // First see if <mprofile> already contains a SHMIOP profile. + // First see if <mprofile> already contains a UIOP profile. for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i) { pfile = mprofile.get_profile (i); |