ChangeLogTag:Mon Feb 14 00:41:11 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

5 files changed, 42 insertions, 23 deletions

diff --git a/protocols/ace/RMCast/Bits.h b/protocols/ace/RMCast/Bits.h
index 0c1090910ce..3b67da19ee2 100644
--- a/protocols/ace/RMCast/Bits.h
+++ b/protocols/ace/RMCast/Bits.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // file      : ace/RMCast/Bits.h
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
@@ -5,14 +7,19 @@
 #ifndef ACE_RMCAST_BITS_H
 #define ACE_RMCAST_BITS_H
 
-#include <ace/Synch.h>
-#include <ace/Auto_Ptr.h>
+#include "ace/Auto_Ptr.h"
+#include "ace/Synch_Traits.h"
+
+
+class ACE_Thread_Mutex;
+template <typename T> class ACE_Guard;
+template <typename T> class ACE_Guard;
+template <typename T> class ACE_Condition;
 
-//#include <iostream>
 
 namespace ACE_RMCast
 {
-  typedef ACE_Thread_Mutex Mutex;
+  typedef ACE_SYNCH_MUTEX Mutex;
   typedef ACE_Guard<Mutex> Lock;
   typedef ACE_Condition<Mutex> Condition;
 
diff --git a/protocols/ace/RMCast/Link.cpp b/protocols/ace/RMCast/Link.cpp
index e6898cfd76c..dd3360889b8 100644
--- a/protocols/ace/RMCast/Link.cpp
+++ b/protocols/ace/RMCast/Link.cpp
@@ -9,7 +9,8 @@ namespace ACE_RMCast
   Link::
   Link (Address const& addr)
       : addr_ (addr),
-        ssock_ (Address ((unsigned short) (0), INADDR_ANY),
+        ssock_ (Address (static_cast<unsigned short> (0),
+                         static_cast<ACE_UINT32> (INADDR_ANY)),
                 AF_INET,
                 IPPROTO_UDP,
                 1)
diff --git a/protocols/ace/RMCast/Protocol.h b/protocols/ace/RMCast/Protocol.h
index ec4b332c52b..2f069128971 100644
--- a/protocols/ace/RMCast/Protocol.h
+++ b/protocols/ace/RMCast/Protocol.h
@@ -7,16 +7,18 @@
 #ifndef ACE_RMCAST_PROTOCOL_H
 #define ACE_RMCAST_PROTOCOL_H
 
-#include <ace/Refcounted_Auto_Ptr.h>
+#include "ace/Refcounted_Auto_Ptr.h"
 
-#include <ace/Vector_T.h>
-#include <ace/Hash_Map_Manager.h>
+#include "ace/Vector_T.h"
+#include "ace/Hash_Map_Manager.h"
 
-#include <ace/OS.h>
-#include <ace/CDR_Stream.h>
-#include <ace/INET_Addr.h>
+//#include "ace/OS.h"
+#include "ace/CDR_Stream.h"
+#include "ace/INET_Addr.h"
+#include "ace/Null_Mutex.h"
 
-#include <ace/RMCast/Bits.h>
+
+#include "ace/RMCast/Bits.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Simulator.h b/protocols/ace/RMCast/Simulator.h
index 9e19f26bb8b..5aa37d48279 100644
--- a/protocols/ace/RMCast/Simulator.h
+++ b/protocols/ace/RMCast/Simulator.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // file      : ace/RMCast/Simulator.h
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
@@ -5,9 +7,11 @@
 #ifndef ACE_RMCAST_SIMULATOR_H
 #define ACE_RMCAST_SIMULATOR_H
 
-#include <ace/RMCast/Stack.h>
-#include <ace/RMCast/Protocol.h>
-#include <ace/RMCast/Bits.h>
+#include "ace/RMCast/Stack.h"
+#include "ace/RMCast/Protocol.h"
+#include "ace/RMCast/Bits.h"
+
+#include "ace/Thread_Mutex.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Socket.h b/protocols/ace/RMCast/Socket.h
index 62f72b9597e..b83a162602b 100644
--- a/protocols/ace/RMCast/Socket.h
+++ b/protocols/ace/RMCast/Socket.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // file      : ace/RMCast/Socket.h
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
@@ -5,16 +7,19 @@
 #ifndef ACE_RMCAST_SOCKET_H
 #define ACE_RMCAST_SOCKET_H
 
-#include <ace/Unbounded_Queue.h>
+#include "ace/RMCast/Stack.h"
+#include "ace/RMCast/Protocol.h"
+#include "ace/RMCast/Bits.h"
+
+#include "ace/RMCast/Link.h"
+#include "ace/RMCast/Simulator.h"
+#include "ace/RMCast/Retransmit.h"
+#include "ace/RMCast/Acknowledge.h"
 
-#include <ace/RMCast/Stack.h>
-#include <ace/RMCast/Protocol.h>
-#include <ace/RMCast/Bits.h>
+#include "ace/Unbounded_Queue.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Condition_T.h"
 
-#include <ace/RMCast/Link.h>
-#include <ace/RMCast/Simulator.h>
-#include <ace/RMCast/Retransmit.h>
-#include <ace/RMCast/Acknowledge.h>
 
 namespace ACE_RMCast
 {