ChangeLogTag:Wed Feb 16 18:31:28 2005 Steve Huston <shuston@riverace.com>

5 files changed, 24 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index b8dca3b4a40..9d510a06fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Feb 16 18:31:28 2005  Steve Huston  <shuston@riverace.com>
+
+	* protocols/ace/RMCast/Acknowledge.cpp:
+	* protocols/ace/RMCast/Link.cpp:
+	* protocols/ace/RMCast/Socket.cpp:
+	  Fixed some constructs to make MSVC6 happy. Primarily, MSVC6 won't
+	  allow type& var (ref). Must be type& var = ref.
+
+	* protocols/ace/RMCast/Protocol.h: Changed struct NAK to class NAK to
+	  make MSVC6 happy.
+
+	  MSVC6 is still not completely happy, but someone with more insight as
+	  to the intentions here will need to take a look.
+
 Wed Feb 16 16:18:45 2005  Dale Wilson  <wilson_d@ociweb.com>
 
         * ace/OS_NS_Thread.cpp:
diff --git a/protocols/ace/RMCast/Acknowledge.cpp b/protocols/ace/RMCast/Acknowledge.cpp
index f25bd02b165..1fdf19a92d9 100644
--- a/protocols/ace/RMCast/Acknowledge.cpp
+++ b/protocols/ace/RMCast/Acknowledge.cpp
@@ -82,7 +82,7 @@ namespace ACE_RMCast
                i != e;
                ++i)
           {
-            Queue& q ((*i).int_id_);
+            Queue& q = (*i).int_id_;
 
             if (q.current_size () == 0) continue;
 
@@ -131,7 +131,7 @@ namespace ACE_RMCast
     for (Queue::iterator i (q.begin ()), e (q.end ()); i != e; ++i)
     {
       u64 sn ((*i).ext_id_);
-      Descr& d ((*i).int_id_);
+      Descr& d = (*i).int_id_;
 
       if (d.lost ())
       {
@@ -195,7 +195,7 @@ namespace ACE_RMCast
 
         if (sn != 0)
         {
-          Queue& q ((*i).int_id_);
+          Queue& q = (*i).int_id_;
 
           u64 old (q.max_sn ());
 
@@ -229,7 +229,7 @@ namespace ACE_RMCast
       }
       else
       {
-        Queue& q (e->int_id_);
+        Queue& q = e->int_id_;
 
         if (sn <= q.sn ())
         {
@@ -294,7 +294,7 @@ namespace ACE_RMCast
       for (Map::iterator i (hold_.begin ()), e (hold_.end ()); i != e; ++i)
       {
         Address addr ((*i).ext_id_);
-        Queue& q ((*i).int_id_);
+        Queue& q = (*i).int_id_;
 
         //@@ Should look for the highest known number.
         //
diff --git a/protocols/ace/RMCast/Link.cpp b/protocols/ace/RMCast/Link.cpp
index a26f474f573..859ff96e382 100644
--- a/protocols/ace/RMCast/Link.cpp
+++ b/protocols/ace/RMCast/Link.cpp
@@ -154,7 +154,7 @@ namespace ACE_RMCast
     // resizing...
     //
     size_t size (0), capacity (8192);
-    char* data (reinterpret_cast<char*> (operator new (capacity)));
+    char* data = reinterpret_cast<char*> (operator new (capacity));
 
     auto_ptr<char> holder (data); // This is wicked.
 
diff --git a/protocols/ace/RMCast/Protocol.h b/protocols/ace/RMCast/Protocol.h
index be18e8d9f16..0cd849da216 100644
--- a/protocols/ace/RMCast/Protocol.h
+++ b/protocols/ace/RMCast/Protocol.h
@@ -502,13 +502,13 @@ namespace ACE_RMCast
   //
   //
   //
-  struct NAK;
+  class NAK;
 
   typedef
   ACE_Refcounted_Auto_Ptr<NAK, ACE_Null_Mutex>
   NAK_ptr;
 
-  struct NAK : Profile
+  class NAK : Profile
   {
     static u16 const id;
 
@@ -594,7 +594,7 @@ namespace ACE_RMCast
     virtual void
     serialize_body (ostream& os) const
     {
-      NAK& this_ (const_cast<NAK&> (*this)); // Don't put in ROM.
+      NAK& this_ = const_cast<NAK&> (*this); // Don't put in ROM.
 
       // Stone age iteration.
       //
diff --git a/protocols/ace/RMCast/Socket.cpp b/protocols/ace/RMCast/Socket.cpp
index cdaa663fa25..5a93a819618 100644
--- a/protocols/ace/RMCast/Socket.cpp
+++ b/protocols/ace/RMCast/Socket.cpp
@@ -77,7 +77,7 @@ namespace ACE_RMCast
     Message_ptr m;
     if (queue_.dequeue_head (m) == -1) abort ();
 
-    Data const* d (static_cast<Data const*>(m->find (Data::id)));
+    Data const* d = static_cast<Data const*>(m->find (Data::id));
 
     size_t r (d->size () < s ? d->size () : s);