ChangeLogTag:Fri Aug 1 20:11:44 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

17 files changed, 41 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e03a595bf40..e50653d0049 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,25 @@
+Fri Aug  1 20:11:44 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* orbsvcs/orbsvcs/Scheduler_Factory.h:
+	* orbsvcs/orbsvcs/Scheduler_Utilities.h:
+	* orbsvcs/orbsvcs/AV/FlowSpec_Entry.h:
+	* orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h:
+	* orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h:
+	* orbsvcs/orbsvcs/Event/BCU.h:
+	* orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+	* orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h:
+	* orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+	* orbsvcs/orbsvcs/Event/EC_Sched_Filter.h:
+	* orbsvcs/orbsvcs/Event/Memory_Pools.h:
+	* orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp:
+	* orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp:
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+	* orbsvcs/orbsvcs/Sched/SchedEntry.cpp: #included "ace/SString.h"
+	  to get them compiling for the timebeing. We need to take a
+	  closer look to see whether they are even necessary in the first
+	  place. We need to take a closer look in the next checkin. 
+
 Fri Aug  1 20:13:36 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
@@ -19,7 +41,7 @@ Fri Aug  1 20:13:36 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 	  valuetype factories, and for the exception references
 	  of operations, attributes and valuetype factories.
 
-Fri Aug  1 17:28:01 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Fri Aug  1 20:08:01 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/Adapter.h: Forward declared CORBA::Exception.
 	* tao/Adapter.cpp: #included Exception.h
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index 0113f23ee49..08fcaf6baf2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -20,6 +20,7 @@
 #include "AV_Core.h"
 #include "ace/Addr.h"
 #include "ace/Containers.h"
+#include "ace/SString.h"
 
 /**
  * @class TAO_Tokenizer
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
index 01249a32160..bb2ea3d2a4a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
@@ -12,7 +12,7 @@
 #ifndef TAO_ESF_BUSY_LOCK_H
 #define TAO_ESF_BUSY_LOCK_H
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
index c8bbdc32731..1489d6fcce1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
@@ -12,7 +12,7 @@
 #ifndef TAO_ESF_REFCOUNT_GUARD_H
 #define TAO_ESF_REFCOUNT_GUARD_H
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/BCU.h b/TAO/orbsvcs/orbsvcs/Event/BCU.h
index 39eed978e46..45c8018f91b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/BCU.h
+++ b/TAO/orbsvcs/orbsvcs/Event/BCU.h
@@ -19,7 +19,7 @@
 #define ACE_BCU_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/os_include/os_stdint.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 16efa2a1d17..7f60a5e6675 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/Event/ECG_UDP_Receiver.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "ace/Unbounded_Set.h"
 
 #include "ace/Reactor.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index 85624609555..e445fc01128 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -22,6 +22,9 @@
 #include "ECG_UDP_Receiver.h"
 #include "ECG_UDP_Out_Endpoint.h"
 #include "ace/Service_Object.h"
+#include "ace/Service_Config.h"
+#include "ace/SString.h"
+#include "ace/os_include/os_stdint.h"
 
 class ACE_Event_Handler;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 603e4927f91..d48156a0dab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -2,7 +2,7 @@
 
 #include "orbsvcs/Event/ECG_UDP_Receiver.h"
 #include "orbsvcs/Event_Utilities.h"
-#include "CRC.h"
+#include "ace/SString.h"
 
 #if !defined(__ACE_INLINE__)
 #include "ECG_UDP_Receiver.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
index c9e7554d2af..099c708e3c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -16,7 +16,7 @@
 #define TAO_EC_BUSY_LOCK_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index 47b4c1ece34..c1093401be5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -24,6 +24,7 @@
 
 #include "orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
+#include "ace/SString.h"
 
 /**
  * @class TAO_EC_Sched_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
index ceafbd40683..824589bc4b2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
@@ -22,6 +22,7 @@
 
 #include "Event_Channel.h"
 #include "Dispatching_Modules.h"
+#include "ace/Malloc.h"
 
 // ************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
index abc14d55a5c..197d4dc0837 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
@@ -16,7 +16,7 @@
 #ifndef NS_CONTAINER_C
 #define NS_CONTAINER_C
 
-#include "ace/Malloc.h"
+#include "ace/Malloc_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 77dd21f079a..b79f19e657a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -5,6 +5,7 @@
 #include "tao/debug.h"
 #include "orbsvcs/NotifyExtC.h"
 #include "RT_Properties.h"
+#include "ace/SString.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "RT_POA_Helper.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 384fd9d37a9..f5b409f914a 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -18,13 +18,12 @@
 #define COSPROPERTYSERVICE_I_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "orbsvcs/Property/property_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Property/property_export.h"
 #include "orbsvcs/CosPropertyServiceS.h"
 
 #include "ace/Hash_Map_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 392a243b970..402678f13de 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -17,6 +17,7 @@
 // ============================================================================
 
 #include "SchedEntry.h"
+#include "ace/SString.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "SchedEntry.i"
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index 56dbe740aaf..4140e3a3892 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -18,13 +18,12 @@
 #define ACE_SCHEDULER_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "orbsvcs/CosNamingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/Sched/sched_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index f937cf79754..beda9ed5551 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -18,13 +18,12 @@
 #define ACE_SCHEDULER_UTILITIES_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "orbsvcs/RtecSchedulerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/Sched/sched_export.h"
 
 class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info