ChangeLogTag:Thu Feb 5 13:30:48 UTC 2004 Don Hinton <dhinton@dre.vanderbilt.edu>

8 files changed, 30 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8d615b93d4d..0134ec9797a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Thu Feb  5 13:30:48 UTC 2004  Don Hinton  <dhinton@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h:
+          Added explicit #include's of SString.h and Null_Mutex.h needed
+          on some platforms (Solaris and Linux).  Thanks to Thomas
+          Lockhart <Thomas.Lockhart@jpl.nasa.gov> for the patch.
+
 Wed Feb  4 04 23:54:55 2004  Huang-Ming Huang  <hh1@cse.wustl.edu>
 
         * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 16efa83de3e..3f9ae599e2b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -14,8 +14,8 @@
 
 #ifndef TAO_PG_FACTORYREGISTRY_H_
 #define TAO_PG_FACTORYREGISTRY_H_
-#include /**/ <ace/pre.h>
-#include <ace/ACE.h>
+#include /**/ "ace/pre.h"
+#include /**/ "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -31,9 +31,10 @@ namespace TAO
 /////////////////////////////////
 // Includes needed by this header
 #include "portablegroup_export.h"
-#include <orbsvcs/orbsvcs/PortableGroupS.h>
-#include <ace/Hash_Map_Manager.h>
-
+#include "orbsvcs/PortableGroupS.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/SString.h"
+#include "ace/Null_Mutex.h"
 
 /////////////////////
 // Forward references
@@ -249,6 +250,6 @@ namespace TAO
   };
 } // namespace TAO
 
-#include /**/ <ace/post.h>
+#include /**/ "ace/post.h"
 
 #endif // TAO_PG_FACTORYREGISTRY_H_
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
index 0306516228c..383c2d212eb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
@@ -27,7 +27,7 @@
 #include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #include "ace/Hash_Map_Manager_T.h"
-
+#include "ace/Null_Mutex.h"
 
 /// Factory hash map.
 typedef ACE_Hash_Map_Manager_Ex<
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
index 6e4b41019aa..803c91fef12 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
@@ -29,7 +29,7 @@
 
 #include "ace/Array_Base.h"
 #include "ace/Hash_Map_Manager_T.h"
-
+#include "ace/Null_Mutex.h"
 
 /// Forward declarations.
 struct TAO_PG_ObjectGroup_Map_Entry;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
index 4fc25b4d1ab..0f43e24cfb6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
@@ -30,7 +30,7 @@
 #include "tao/PortableServer/PortableServerC.h"
 
 #include "ace/Hash_Map_Manager_T.h"
-
+#include "ace/Null_Mutex.h"
 
 /**
  * @class TAO_PG_ObjectGroup_Map_Entry
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index 10f9475fde2..31f1a7bc1a8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -18,6 +18,7 @@
 
 #include "ace/Vector_T.h"
 #include "ace/Pair_T.h"
+#include "ace/SString.h"
 
 namespace TAO_PG
 {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 1832bc50fec..aa99a927ecb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -21,10 +21,11 @@
 #include /**/ "ace/pre.h"
 
 #include "portablegroup_export.h"
-#include <orbsvcs/orbsvcs/PortableGroupS.h>
-#include <orbsvcs/orbsvcs/CosNamingC.h>
-#include <ace/Hash_Map_Manager.h>
-#include <ace/SString.h>
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/SString.h"
+#include "ace/Null_Mutex.h"
 
 namespace TAO
 {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 6566e78b91d..b51a33166ad 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -26,6 +26,7 @@
 
 #include "UIPMC_Connection_Handler.h"
 #include "portablegroup_export.h"
+#include "ace/Null_Mutex.h"
 
 // ****************************************************************