diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-07 05:51:20 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-07 05:51:20 +0000 |
| commit | 154ce55fb56b20b553f65250b8a8fa887f7a43d3 (patch) | |
| tree | b62d60737a77dcee4b1ef2fc032e6e757350965d | |
| parent | 43a10dcf9be58755eb039b8d140cfcba00b523ce (diff) | |
| download | ATCD-154ce55fb56b20b553f65250b8a8fa887f7a43d3.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-99c | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h | 10 |
3 files changed, 17 insertions, 7 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 0a55afdcec2..7033dc334e7 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,9 @@ +1999-04-07 Irfan Pyarali <irfan@cs.wustl.edu> + + * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h + (ServiceTypeRepository): Used Service_Type_Map_Iterator instead + of Service_Type_Map::iterator. Stupid g++ could not gork it. + Tue Apr 6 19:52:55 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu> * orbsvcs/tests/Property/PropertyTest.dsw: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index 3d5af7f1ccf..be883ab595b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -1,5 +1,3 @@ -$Id$ - // ======================================================================== // // $Id$ @@ -41,7 +39,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) { ACE_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_); - for (Service_Type_Map::iterator service_map_iterator (this->type_map_); + for (Service_Type_Map_Iterator service_map_iterator (this->type_map_); ! service_map_iterator.done (); service_map_iterator++) { @@ -207,7 +205,7 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& CosTradingRepos::ServiceTypeRepository::IncarnationNumber num = which_types.incarnation (); - for (Service_Type_Map::iterator itr (this->type_map_); + for (Service_Type_Map_Iterator itr (this->type_map_); ! itr.done (); itr++) { @@ -579,7 +577,7 @@ update_type_map (const char* name, // update entries for all supertypes to include this type as a subtype. // we can use the super_types_map we have constructed. - for (Service_Type_Map::iterator super_map_iterator (super_map); + for (Service_Type_Map_Iterator super_map_iterator (super_map); ! super_map_iterator.done (); super_map_iterator++) { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index e3673bd2b44..ee482f6a643 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -1,6 +1,4 @@ /* -*- C++ -*- */ -$Id$ - // ======================================================================== // $Id$ // @@ -20,6 +18,7 @@ $Id$ #define TAO_SERVICE_TYPE_REPOSITORY_H #include "Trader.h" +#include "ace/Hash_Map_Manager.h" class TAO_ORBSVCS_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository { @@ -223,6 +222,13 @@ public: ACE_Null_Mutex> Service_Type_Map; + typedef ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, + Type_Info *, + ACE_Hash<TAO_String_Hash_Key>, + ACE_Equal_To<TAO_String_Hash_Key>, + ACE_Null_Mutex> + Service_Type_Map_Iterator; + void fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct &type_struct, CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types); |