diff options
| author | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-12 17:58:00 +0000 |
|---|---|---|
| committer | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-12 17:58:00 +0000 |
| commit | 10142664759b4b0beb9263ad776e7eda49fd8a93 (patch) | |
| tree | 16a2657e539ec760bc3bd50f29e73962cee70dbc /TAO/orbsvcs | |
| parent | 978035bb4509965a36d736de150aa6f60b7d96d7 (diff) | |
| download | ATCD-10142664759b4b0beb9263ad776e7eda49fd8a93.tar.gz | |
minor changes, ask Seth
Diffstat (limited to 'TAO/orbsvcs')
4 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.cpp index 70897a7157b..79fd21ee1a7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.cpp @@ -27,7 +27,7 @@ TAO_Constraint_Validator(TypeStruct* type_struct) { string prop_name_str((const char*)prop_seq[i].name); CORBA::TypeCode_var corba_type = prop_seq[i].value_type; - this->type_map_[prop_name_str] = (const TypeCode_ptr)corba_type; + this->type_map_[prop_name_str] = (const CORBA::TypeCode_ptr)corba_type; } } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp index 4fd0f5af13e..8c6eb07deb6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp @@ -181,7 +181,7 @@ perform_lookup (const char* type, CosTradingRepos::ServiceTypeRepository_ptr rep, TAO_Policies& policies, LOOKUP_OFFER_LIST& ordered_offers, - PolicyNameSeq_out returned_limits_applied, + CosTrading::PolicyNameSeq_out returned_limits_applied, CORBA::Environment& env) TAO_THROW_SPEC ((CosTrading::IllegalConstraint, CosTrading::Lookup::IllegalPreference, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.cpp index ec78e9f2921..8cedf1baf86 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.cpp @@ -82,7 +82,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, // Determine if we have anything left to offer. if (this->iters_.empty ()) - return_value = B_FALSE; + return_value = CORBA::B_FALSE; return return_value; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index 67f3ef80df6..66e096a5245 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -39,13 +39,13 @@ public: ~TAO_Service_Type_Repository (void); - virtual SERVICE_TYPE_REPOS::IncarnationNumber + virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber incarnation (CORBA::Environment& _env); - virtual SERVICE_TYPE_REPOS::IncarnationNumber + virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber add_type (const char * name, const char * if_name, - const SERVICE_TYPE_REPOS::PropStructSeq& props, + const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, const SERVICE_TYPE_REPOS::ServiceTypeNameSeq& super_types, CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, |