ChangeLogTag: Mon Dec 22 14:55:59 2003 Dale Wilson <wilson_d@ociweb.com>

14 files changed, 19 insertions, 4 deletions

diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 320ab55f4a8..b2f4e4ee732 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -16,9 +16,11 @@
 #include "FT_Property_Validator.h"
 
 #include <ace/Get_Opt.h>
+#include <ace/OS_NS_stdio.h>
 #include <tao/Messaging/Messaging.h>
 #include <tao/IORTable/IORTable.h>
 #include <tao/debug.h>
+#include <tao/ORB_Constants.h>
 #include <orbsvcs/PortableGroup/PG_Object_Group.h>
 #include <orbsvcs/PortableGroup/PG_Property_Set.h>
 #include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
index 7795ecf6cb2..b59e178dcd0 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -13,6 +13,7 @@
 //=============================================================================
 #include "Fault_Detector_i.h"
 #include "FT_FaultDetectorFactory_i.h"
+#include <tao/debug.h>
 
 ///////////////////////////////
 // Fault_Detector_i static data
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
index caac2690042..d5882ad1a15 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
@@ -26,6 +26,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include <ace/Manual_Event.h>
+
 //////////////////////////////////
 // Classes declared in this header
 namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index 2a381028005..f9e93824f1c 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -41,7 +41,7 @@
  * to keep trying to connect to server object groups under certain
  * conditions.
  */
-class TAO_FT_Export TAO_FT_Request_Duration_Policy
+class TAO_FT_ClientORB_Export TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
     public TAO_Local_RefCounted_Object
 {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index e7c0929c9cc..51c759baba1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -6,6 +6,9 @@
 
 #include <ace/Get_Opt.h>
 #include <ace/Vector_T.h>
+#include <ace/OS_NS_stdio.h>
+#include <tao/debug.h>
+#include <tao/ORB_Constants.h>
 #include <tao/PortableServer/ORB_Manager.h>
 #include "PG_Operators.h" // operator == on CosNaming::Name
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index e3d848eb1ea..6865d9c1c9a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -189,8 +189,8 @@ namespace TAO
      * Implementation methods should assume the mutex is
      * locked if necessary.
      */
-    ACE_Mutex internals_;
-    typedef ACE_Guard<ACE_Mutex> InternalGuard;
+    TAO_SYNCH_MUTEX internals_;
+    typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
 
     /**
      * The orb
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index 2068c254865..532998e6a11 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -21,6 +21,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include <ace/Hash_Map_Manager.h>
 #include <tao/PortableServer/PortableServerC.h>
 #include <orbsvcs/PortableGroupC.h>
 #include "PG_Object_Group_Manipulator.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 9d98700bbcc..0e1551447a7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -7,6 +7,7 @@
 
 #include <ace/Get_Opt.h>
 #include <ace/Vector_T.h>
+#include <tao/debug.h>
 #include <tao/PortableServer/ORB_Manager.h>
 #include <orbsvcs/PortableGroup/PG_Operators.h> // Borrow operator == on CosNaming::Name
 #include <orbsvcs/PortableGroup/PG_Utils.h>
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index 6c86aaec4f8..febbee25e61 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -14,6 +14,7 @@
 #include "PG_Utils.h"
 
 #include "tao/debug.h"
+#include <ace/OS_NS_stdio.h>
 
 ACE_RCSID (PortableGroup,
            PG_Object_Group_Manipulator,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index 51fe4ed25c4..e2efa5c8a28 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -17,6 +17,7 @@
  */
 //=============================================================================
 #include "PG_Property_Set.h"
+#include <tao/debug.h>
 
 //////////////////////
 // PG_Property_Set
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 95ce602f883..4eca926566b 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -18,7 +18,7 @@
 #include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
 
 #include <ace/Get_Opt.h>
-
+#include <ace/OS_NS_stdio.h>
 
 FTAPP::FT_Creator::FT_Creator ()
   : creator_ ()
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 89b2b5c1aa2..0757b649625 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -16,6 +16,7 @@
 #include "FT_TestReplica_i.h"
 #include "FT_ReplicaFactory_i.h"
 #include <tao/PortableServer/ORB_Manager.h>
+#include <tao/ORB_Constants.h>
 #include <iostream>
 #include "FT_TestReplicaC.h"
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 4254cbe73ff..81deb8ba81b 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -4,6 +4,7 @@
 
 #include "StubFaultNotifier.h"
 #include <ace/Get_Opt.h>
+#include <ace/OS_NS_stdio.h>
 #include <tao/PortableServer/ORB_Manager.h>
 #include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h>
 #include <iostream>
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 5da8173f8fa..f7f8011368a 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -13,6 +13,7 @@
 //=============================================================================
 
 #include "TAO_Object_Group_Creator.h"
+#include <ace/OS_NS_stdio.h>
 #include <iostream>
 #include <fstream>
 #include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>