ChangeLogTag:Sat Nov 1 05:40:21 UTC 2003 Don Hinton <dhinton@dresystems.com>

12 files changed, 40 insertions, 14 deletions

diff --git a/protocols/ace/RMCast/RMCast.h b/protocols/ace/RMCast/RMCast.h
index 2259af24fbb..9d9d7650e54 100644
--- a/protocols/ace/RMCast/RMCast.h
+++ b/protocols/ace/RMCast/RMCast.h
@@ -18,13 +18,14 @@
 #define ACE_RMCAST_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
 #include "RMCast_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Basic_Types.h"
+
 class ACE_Message_Block;
 class ACE_RMCast_Proxy;
 
diff --git a/protocols/ace/RMCast/RMCast_Copy_On_Write.h b/protocols/ace/RMCast/RMCast_Copy_On_Write.h
index 4421ca92b83..c73dade591b 100644
--- a/protocols/ace/RMCast/RMCast_Copy_On_Write.h
+++ b/protocols/ace/RMCast/RMCast_Copy_On_Write.h
@@ -6,7 +6,9 @@
 #include /**/ "ace/pre.h"
 
 #include "RMCast_Worker.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Basic_Types.h"
+#include "ace/Condition_Thread_Mutex.h"
 
 //! A wrapper to implement reference counted collections
 template<class COLLECTION, class ITERATOR>
diff --git a/protocols/ace/RMCast/RMCast_Copy_On_Write.i b/protocols/ace/RMCast/RMCast_Copy_On_Write.i
index 3c069c84eb6..c83483c0729 100644
--- a/protocols/ace/RMCast/RMCast_Copy_On_Write.i
+++ b/protocols/ace/RMCast/RMCast_Copy_On_Write.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
+#include "ace/Guard_T.h"
+#include "ace/Null_Mutex.h"
+
 template<class COLLECTION, class ITERATOR> ACE_INLINE
 ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR>::
     ACE_RMCast_Copy_On_Write_Collection (void)
diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.cpp b/protocols/ace/RMCast/RMCast_IO_UDP.cpp
index cfed8a53d98..13801b47bd5 100644
--- a/protocols/ace/RMCast/RMCast_IO_UDP.cpp
+++ b/protocols/ace/RMCast/RMCast_IO_UDP.cpp
@@ -1,16 +1,21 @@
 // $Id$
 
 #include "RMCast_IO_UDP.h"
+
+#if !defined (__ACE_INLINE__)
+# include "RMCast_IO_UDP.i"
+#endif /* ! __ACE_INLINE__ */
+
 #include "RMCast_UDP_Proxy.h"
 #include "RMCast_Module_Factory.h"
 
 #include "ace/Handle_Set.h"
 #include "ace/Reactor.h"
 #include "ace/Message_Block.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_IO_UDP.i"
-#endif /* ! __ACE_INLINE__ */
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_sys_select.h"
+#include "ace/os_include/arpa/os_inet.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(ace, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp")
 
diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.h b/protocols/ace/RMCast/RMCast_IO_UDP.h
index 4881233cb59..9e1a83dc032 100644
--- a/protocols/ace/RMCast/RMCast_IO_UDP.h
+++ b/protocols/ace/RMCast/RMCast_IO_UDP.h
@@ -19,6 +19,7 @@
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Synch.h"
 #include "ace/INET_Addr.h"
+#include "ace/Null_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/protocols/ace/RMCast/RMCast_Membership.cpp b/protocols/ace/RMCast/RMCast_Membership.cpp
index 91c9b1a9cea..598e05019af 100644
--- a/protocols/ace/RMCast/RMCast_Membership.cpp
+++ b/protocols/ace/RMCast/RMCast_Membership.cpp
@@ -3,12 +3,14 @@
 //
 
 #include "RMCast_Membership.h"
-#include "RMCast_Proxy.h"
 
 #if !defined (__ACE_INLINE__)
 # include "RMCast_Membership.i"
 #endif /* ! __ACE_INLINE__ */
 
+#include "RMCast_Proxy.h"
+#include "ace/Guard_T.h"
+
 ACE_RCSID(ace, RMCast_Membership, "$Id$")
 
 ACE_RMCast_Membership::~ACE_RMCast_Membership (void)
diff --git a/protocols/ace/RMCast/RMCast_Membership.h b/protocols/ace/RMCast/RMCast_Membership.h
index beab2c881f9..14d5790e584 100644
--- a/protocols/ace/RMCast/RMCast_Membership.h
+++ b/protocols/ace/RMCast/RMCast_Membership.h
@@ -20,7 +20,8 @@
 
 #include "RMCast_Module.h"
 #include "ace/Containers.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/protocols/ace/RMCast/RMCast_Reassembly.h b/protocols/ace/RMCast/RMCast_Reassembly.h
index bc3fc17049d..d4ed999cf78 100644
--- a/protocols/ace/RMCast/RMCast_Reassembly.h
+++ b/protocols/ace/RMCast/RMCast_Reassembly.h
@@ -16,7 +16,9 @@
 
 #include "RMCast_Module.h"
 #include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/protocols/ace/RMCast/RMCast_Reordering.h b/protocols/ace/RMCast/RMCast_Reordering.h
index 4ecf824acac..dadca2aa0f6 100644
--- a/protocols/ace/RMCast/RMCast_Reordering.h
+++ b/protocols/ace/RMCast/RMCast_Reordering.h
@@ -17,7 +17,9 @@
 
 #include "RMCast_Module.h"
 #include "ace/RB_Tree.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/protocols/ace/RMCast/RMCast_Sequencer.cpp b/protocols/ace/RMCast/RMCast_Sequencer.cpp
index f8bc0e6c57d..356fbb4a01b 100644
--- a/protocols/ace/RMCast/RMCast_Sequencer.cpp
+++ b/protocols/ace/RMCast/RMCast_Sequencer.cpp
@@ -8,6 +8,8 @@
 # include "RMCast_Sequencer.i"
 #endif /* ! __ACE_INLINE__ */
 
+#include "ace/Guard_T.h"
+
 ACE_RCSID(ace, RMCast_Sequencer, "$Id$")
 
 ACE_RMCast_Sequencer::~ACE_RMCast_Sequencer (void)
diff --git a/protocols/ace/RMCast/RMCast_Sequencer.h b/protocols/ace/RMCast/RMCast_Sequencer.h
index 8e6447dce62..28f83a1d4b3 100644
--- a/protocols/ace/RMCast/RMCast_Sequencer.h
+++ b/protocols/ace/RMCast/RMCast_Sequencer.h
@@ -16,7 +16,8 @@
 #include /**/ "ace/pre.h"
 
 #include "RMCast_Module.h"
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp b/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp
index c84b8c0f2ef..fb7eaf72f76 100644
--- a/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp
+++ b/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp
@@ -1,14 +1,17 @@
 // $Id$
 
 #include "RMCast_UDP_Proxy.h"
-#include "RMCast_Module.h"
-#include "RMCast_IO_UDP.h"
-#include "ace/Message_Block.h"
 
 #if !defined (__ACE_INLINE__)
 # include "RMCast_UDP_Proxy.i"
 #endif /* ! __ACE_INLINE__ */
 
+#include "RMCast_Module.h"
+#include "RMCast_IO_UDP.h"
+#include "ace/Message_Block.h"
+#include "ace/OS_NS_string.h"
+#include "ace/os_include/arpa/os_inet.h"
+
 ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$")
 
 ACE_RMCast_UDP_Proxy::ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp,