diff options
| author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-03-01 08:18:46 +0000 |
|---|---|---|
| committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-03-01 08:18:46 +0000 |
| commit | e7dd8ca8d72852288894ac4f1bd53da1edbaee0a (patch) | |
| tree | 246a3f775bdeceafdd67e8bcc4fcd0219e132187 | |
| parent | e964f37417fe2e6dca4521f16bcdd9b440d9b648 (diff) | |
| download | ATCD-e7dd8ca8d72852288894ac4f1bd53da1edbaee0a.tar.gz | |
ChangeLogTag: Tue Mar 1 10:33:15 2005 Boris Kolpackov <boris@kolpackov.net>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | protocols/ace/RMCast/Acknowledge.h | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 539742c78bb..489c1f2e66d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 1 10:33:15 2005 Boris Kolpackov <boris@kolpackov.net> + + * protocols/ace/RMCast/Acknowledge.h: Made Acknowledge::Descr + public to get broken Sun C++ 5.4 out of its misery. + Tue Mar 1 07:40:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_hpux_aCC.GNU: diff --git a/protocols/ace/RMCast/Acknowledge.h b/protocols/ace/RMCast/Acknowledge.h index ce99305d334..39de2f63a1c 100644 --- a/protocols/ace/RMCast/Acknowledge.h +++ b/protocols/ace/RMCast/Acknowledge.h @@ -35,7 +35,10 @@ namespace ACE_RMCast virtual void send (Message_ptr m); - private: + // Sun C++ 5.4 can't handle private here. + // + // private: + public: struct Descr { //@@ There should be no default c-tor. @@ -107,6 +110,7 @@ namespace ACE_RMCast unsigned long timer_; }; + private: struct Queue : ACE_Hash_Map_Manager<u64, Descr, ACE_Null_Mutex> { typedef ACE_Hash_Map_Manager<u64, Descr, ACE_Null_Mutex> Base; @@ -194,8 +198,6 @@ namespace ACE_RMCast u64 sn_, max_sn_; }; - friend struct Acknowledge::Queue; - typedef ACE_Hash_Map_Manager_Ex<Address, Queue, |