diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-02-17 01:08:21 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-02-17 01:08:21 +0000 |
| commit | e1f432a451608ffa13a4268a304d799b511d63e3 (patch) | |
| tree | 7b12aee99d2cc3c8f1e68a47984f185854a9022f | |
| parent | 72885ad732f89aafdbc5d5853b72ff909e693135 (diff) | |
| download | ATCD-e1f432a451608ffa13a4268a304d799b511d63e3.tar.gz | |
ChangeLogTag:Wed Feb 16 17:04:50 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/rmcast.mpb | 2 | ||||
| -rw-r--r-- | protocols/ace/RMCast/Protocol.h | 6 | ||||
| -rw-r--r-- | protocols/ace/RMCast/RMCast.mpc | 2 |
4 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 9d510a06fb2..fed4ad1b423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Wed Feb 16 17:04:50 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * bin/MakeProjectCreator/config/rmcast.mpb: + * protocols/ace/RMCast/RMCast.mpc: + + The RMCast protocol implementation currently requires thread + support. Updated these MPC files accordingly. + + * protocols/ace/RMCast/Protocol.h (NAK): + + Since "NAK" is now a class instead of struct, public inheritance + must be explicitly specified. Fixes compile-time errors related + to inaccessible members in the "Profile" base class. + Wed Feb 16 18:31:28 2005 Steve Huston <shuston@riverace.com> * protocols/ace/RMCast/Acknowledge.cpp: diff --git a/bin/MakeProjectCreator/config/rmcast.mpb b/bin/MakeProjectCreator/config/rmcast.mpb index 72cf0e9abc8..c6e918e307e 100644 --- a/bin/MakeProjectCreator/config/rmcast.mpb +++ b/bin/MakeProjectCreator/config/rmcast.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : acelib, exceptions { +project : acelib, exceptions, threads { after += RMCast libs += ACE_RMCast includes += $(ACE_ROOT)/protocols diff --git a/protocols/ace/RMCast/Protocol.h b/protocols/ace/RMCast/Protocol.h index 0cd849da216..f0c43134efe 100644 --- a/protocols/ace/RMCast/Protocol.h +++ b/protocols/ace/RMCast/Protocol.h @@ -508,10 +508,11 @@ namespace ACE_RMCast ACE_Refcounted_Auto_Ptr<NAK, ACE_Null_Mutex> NAK_ptr; - class NAK : Profile + class NAK : public Profile { - static u16 const id; + public: + static u16 const id; #if defined (__BORLANDC__) && (__BORLANDC__ <= 0x570) // Borland C++ Builder 6 and earlier don't handle default template @@ -523,7 +524,6 @@ namespace ACE_RMCast typedef SerialNumbers::Iterator iterator; - public: NAK (Header const& h, istream& is) : Profile (h, 8) { diff --git a/protocols/ace/RMCast/RMCast.mpc b/protocols/ace/RMCast/RMCast.mpc index b223d6036b4..7657d0d76d8 100644 --- a/protocols/ace/RMCast/RMCast.mpc +++ b/protocols/ace/RMCast/RMCast.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RMCast) : acelib, core, exceptions { +project(RMCast) : acelib, core, exceptions, threads { sharedname = ACE_RMCast dynamicflags = ACE_RMCAST_BUILD_DLL } |