diff options
| author | huangming <huangminghuang@users.noreply.github.com> | 2003-10-21 06:43:38 +0000 |
|---|---|---|
| committer | huangming <huangminghuang@users.noreply.github.com> | 2003-10-21 06:43:38 +0000 |
| commit | fb2de5495c0e74f8ce7cf31e1cfa91ecada92b90 (patch) | |
| tree | 18fc3d82fd5e85243020977c0bd137ffa1fb777d | |
| parent | 06b7595f09931578d26481e1e9e132540ea2a4aa (diff) | |
| download | ATCD-fb2de5495c0e74f8ce7cf31e1cfa91ecada92b90.tar.gz | |
ChangeLogTag: Tue Oct 21 01:39:44 2003 Huang-Ming Huang <hh1@cse.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 28 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h | 6 |
2 files changed, 20 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index eb4013c473e..ec5dcfb9c99 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Oct 21 01:39:44 2003 Huang-Ming Huang <hh1@cse.wustl.edu> + + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h: + Modified the typedef to Dynamic_Bitset::reference::size_type to + make Forte compiler happy. + Tue Oct 21 05:51:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc: @@ -5,25 +11,25 @@ Tue Oct 21 05:51:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> Mon Oct 20 21:55:41 2003 Huang-Ming Huang <hh1@cse.wustl.edu> - * orbsvcs/orbsvcs/FtRtEventClientORB/FTRT_ClientORB_Loader.cpp: - * orbsvcs/orbsvcs/FtRtEventClientORB/FTRT_ClientORB_Loader.h: - * orbsvcs/orbsvcs/FtRtEventEventChannel/Fault_Detector_Loader.cpp: - * orbsvcs/orbsvcs/FtRtEventEventChannel/Fault_Detector_Loader.h: - * orbsvcs/orbsvcs/FtRtEventEventChannel/Identification_Service.cpp: - * orbsvcs/orbsvcs/FtRtEventEventChannel/Identification_Service.h: - * orbsvcs/orbsvcs/FtRtEventEventChannel/Replication_Service.cpp: - * orbsvcs/orbsvcs/FtRtEventEventChannel/Replication_Service.h: + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp: + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h: Remove redundant semicolon in the ACE_FACTORY_DEFINE, ACE_STATIC_SVC_REQUIRE and ACE_STATIC_SVC_DEFINE. - * orbsvcs/orbsvcs/FtRtEventEventChannel/AMI_Primary_Replication_Strategy.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp: Fixed the problem to access pointer to member using var object, Forte compiler do not accept it. - * orbsvcs/orbsvcs/FtRtEventEventChannel/Dynamic_Bitset.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h: Added typedef to Dynamic_Bitset::reference::size_type. - * orbsvcs/orbsvcs/FtRtEventUtils/UUID.cpp + * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp Added missed semicolon. Mon Oct 20 14:58:00 2003 Huang-Ming Huang <hh1@cse.wustl.edu> diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h index 6940b21e302..1b74424b31b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h @@ -29,7 +29,7 @@ class Dynamic_Bitset public: class reference { public: - typedef Dynamic_Bitset::size_type size_type; + typedef unsigned size_type; reference(Dynamic_Bitset* bitset, size_type bit); reference operator = (bool val); operator bool () const; @@ -70,7 +70,7 @@ inline Dynamic_Bitset operator & (const Dynamic_Bitset& lhs, const Dynamic_Bitse -inline Dynamic_Bitset::reference::reference(Dynamic_Bitset* bitset, size_type bit) +inline Dynamic_Bitset::reference::reference(Dynamic_Bitset* bitset, Dynamic_Bitset::reference::size_type bit) : bitset_(bitset), bit_(bit) { } @@ -109,7 +109,7 @@ inline Dynamic_Bitset::size_type Dynamic_Bitset::size() const return bit_size_; } -inline Dynamic_Bitset::reference Dynamic_Bitset::operator[](size_type bit) +inline Dynamic_Bitset::reference Dynamic_Bitset::operator[](Dynamic_Bitset::size_type bit) { return Dynamic_Bitset::reference(this, bit); } |