diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-10-24 20:41:40 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-10-24 20:41:40 +0000 |
| commit | e982dcd43dadcae72cdf5563b275b170cba9bb1f (patch) | |
| tree | 3f441120c77ba47abbc0960b4dc7cc64754fc97d /TAO | |
| parent | a3e05906c6d830db0734142432e317f1598e9484 (diff) | |
| download | ATCD-e982dcd43dadcae72cdf5563b275b170cba9bb1f.tar.gz | |
ChangeLogTag:Tue Oct 24 13:36:05 2000 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | TAO/tao/PolicyFactory_Registry.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/PolicyFactory_Registry.h | 5 |
3 files changed, 16 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 6f28d7d29ba..90209d8c0e4 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Tue Oct 24 13:36:05 2000 Ossama Othman <ossama@uci.edu> + + * tao/PolicyFactory_Registry.h: + + Removed the local ITERATOR typedef. It confused brain-damaged + g++ 2.7.x. + + * tao/PolicyFactory_Registry.cpp (~TAO_PolicyFactory_Registry): + + Use the ACE_Map_Manager<>::ITERATOR trait instead of the now + removed typedef local to this class. + Tue Oct 24 11:18:01 2000 Priyanka Gontla <pgontla@ece.uci.edu> * tao/Typecode.cpp : diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp index 5023462960a..573a609e66f 100644 --- a/TAO/tao/PolicyFactory_Registry.cpp +++ b/TAO/tao/PolicyFactory_Registry.cpp @@ -16,7 +16,10 @@ TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (TAO_ORB_Core *orb_core) TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void) { - for (ITERATOR i (this->factories_); !i.done (); ++i) + TABLE::ITERATOR begin = this->factories_.begin (); + TABLE::ITERATOR end = this->factories_.end (); + + for (TABLE::ITERATOR i = begin; i != end; ++i) CORBA::release ((*i).int_id_); } diff --git a/TAO/tao/PolicyFactory_Registry.h b/TAO/tao/PolicyFactory_Registry.h index a26a4c304c8..6fb89653cdd 100644 --- a/TAO/tao/PolicyFactory_Registry.h +++ b/TAO/tao/PolicyFactory_Registry.h @@ -37,11 +37,6 @@ class TAO_Export TAO_PolicyFactory_Registry { public: - typedef ACE_Map_Iterator< - CORBA::PolicyType, - PortableInterceptor::PolicyFactory_ptr, - ACE_Null_Mutex> ITERATOR; - typedef ACE_Map_Manager< CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, |