ChangeLogTag:Sun Aug 17 23:41:22 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

26 files changed, 171 insertions, 56 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 915f23e3c68..e794906e111 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,47 @@
+Sun Aug 17 23:41:22 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
+	* orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h:
+	* orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h: 
+	* orbsvcs/orbsvcs/Log/LogRecordStore.h: 
+	* orbsvcs/orbsvcs/Notify/PropertySeq.h:
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+	* orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+	* orbsvcs/orbsvcs/Trader/Offer_Database.h:
+	* orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
+	* orbsvcs/orbsvcs/Trader/Trader_Utils.h:
+
+	  Include "ace/Null_Mutex.h" to pull in ACE_Null_Mutex class
+	  declaration.
+
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+	* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
+	* orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
+
+	  Include "ace/Reverse_Lock_T.h" to pull in ACE_Reverse_Lock<>
+	  template.
+
+	* orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h:
+	* orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
+	* orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
+	* orbsvcs/orbsvcs/Trader/Trader_T.h:
+
+	  Include "ace/Lock_Adapter_T.h" to pull in ACE_Lock_Adapter<>
+	  template.
+
+	* orbsvcs/orbsvcs/Trader/Trader.cpp:
+
+	  Include "ace/Thread_Mutex.h" and "ace/RW_Thread_Mutex.h" to pull
+	  in ACE_{RW_}Thread_Mutex class declarations.
+
+	* orbsvcs/orbsvcs/Log/PersistStore.h:
+
+	  Include "ace/Mutex.h" to pull in ACE_Mutex class declaration.
+
 Sun Aug 17 17:22:03 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* tao/Cleanup_Func_Registry.h:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index e48fd6ff478..24694570726 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_Dispatching_Task.h
@@ -12,10 +13,12 @@
 
 #ifndef TAO_CEC_DISPATCHING_TASK_H
 #define TAO_CEC_DISPATCHING_TASK_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/Task.h"
 #include "ace/Message_Block.h"
+#include "ace/Lock_Adapter_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +27,7 @@
 #include "orbsvcs/CosEvent/event_export.h"
 #include "CEC_ProxyPushSupplier.h"
 
+
 /**
  * @class TAO_CEC_Dispatching_Task
  *
@@ -113,4 +117,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
-#endif /* TAO_CEC_DISPATCHING_TASK_H */
+
+#endif  /* TAO_CEC_DISPATCHING_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 02da6560908..592b10354b4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -6,11 +6,15 @@
 #include "CEC_SupplierControl.h"
 #include "CEC_ProxyPullSupplier.h"
 
+#include "ace/Reverse_Lock_T.h"
+
 #if ! defined (__ACE_INLINE__)
 #include "CEC_ProxyPullConsumer.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(CosEvent, CEC_ProxyPullConsumer, "$Id$")
+ACE_RCSID (CosEvent,
+           CEC_ProxyPullConsumer,
+           "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 877b8946c32..32cbc3086f1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -4,11 +4,15 @@
 #include "CEC_Dispatching.h"
 #include "CEC_EventChannel.h"
 
+#include "ace/Reverse_Lock_T.h"
+
 #if ! defined (__ACE_INLINE__)
 #include "CEC_ProxyPullSupplier.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(CosEvent, CEC_ProxyPullSupplier, "$Id$")
+ACE_RCSID (CosEvent,
+           CEC_ProxyPullSupplier,
+           "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index a9ae7707700..28e521b2877 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_ProxyPullSupplier.h
@@ -12,6 +13,7 @@
 
 #ifndef TAO_CEC_PROXYPULLSUPPLIER_H
 #define TAO_CEC_PROXYPULLSUPPLIER_H
+
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosEventChannelAdminS.h"
@@ -21,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Message_Queue.h"
+#include "ace/Condition_Thread_Mutex.h"
 #include "event_export.h"
 
 class TAO_CEC_EventChannel;
@@ -157,4 +160,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
-#endif /* TAO_CEC_PROXYPULLSUPPLIER_H */
+
+#endif  /* TAO_CEC_PROXYPULLSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index b1a3ba1ff39..434769bbb9d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -5,11 +5,15 @@
 #include "CEC_ConsumerAdmin.h"
 #include "CEC_ProxyPushSupplier.h"
 
+#include "ace/Reverse_Lock_T.h"
+
 #if ! defined (__ACE_INLINE__)
 #include "CEC_ProxyPushConsumer.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(CosEvent, CEC_ProxyPushConsumer, "$Id$")
+ACE_RCSID (CosEvent,
+           CEC_ProxyPushConsumer,
+           "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index 88382ca8f90..2e2b42161b8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -7,11 +7,15 @@
 #include "orbsvcs/ESF/ESF_RefCount_Guard.h"
 #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
+#include "ace/Reverse_Lock_T.h"
+
 #if ! defined (__ACE_INLINE__)
 #include "CEC_ProxyPushSupplier.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(CosEvent, CEC_ProxyPushSupplier, "$Id$")
+ACE_RCSID (CosEvent,
+           CEC_ProxyPushSupplier,
+           "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index 2498031bbf7..f8441511cf4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ECG_Complex_Address_Server.h
  *
@@ -10,6 +11,7 @@
 
 #ifndef TAO_ECG_COMPLEX_ADDRESS_SERVER_H
 #define TAO_ECG_COMPLEX_ADDRESS_SERVER_H
+
 #include /**/ "ace/pre.h"
 
 #include /**/ "event_export.h"
@@ -17,6 +19,7 @@
 #include "orbsvcs/RtecUDPAdminS.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/INET_Addr.h"
+#include "ace/Null_Mutex.h"
 
 #include "EC_Lifetime_Utils_T.h"
 
@@ -108,4 +111,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
-#endif /* TAO_ECG_COMPLEX_ADDRESS_SERVER_H */
+
+#endif  /* TAO_ECG_COMPLEX_ADDRESS_SERVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index d0ffcebdb6c..e6f67b0085d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -4,11 +4,15 @@
 #include "EC_Event_Channel_Base.h"
 #include "EC_Filter_Builder.h"
 
+#include "ace/Reverse_Lock_T.h"
+
 #if ! defined (__ACE_INLINE__)
 #include "EC_Default_ProxySupplier.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Event, EC_ProxySupplier, "$Id$")
+ACE_RCSID (Event,
+           EC_ProxySupplier,
+           "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 1bfa286a268..113c5a7b1ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Dispatching_Task.h
  *
@@ -14,6 +15,7 @@
 
 #ifndef TAO_EC_DISPATCHING_TASK_H
 #define TAO_EC_DISPATCHING_TASK_H
+
 #include /**/ "ace/pre.h"
 
 #include "EC_ProxySupplier.h"
@@ -26,6 +28,7 @@
 #include /**/ "event_export.h"
 #include "ace/Task.h"
 #include "ace/Message_Block.h"
+#include "ace/Lock_Adapter_T.h"
 
 class TAO_RTEvent_Export TAO_EC_Queue : public ACE_Message_Queue<ACE_SYNCH>
 {
@@ -137,4 +140,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
-#endif /* TAO_EC_DISPATCHING_TASK_H */
+
+#endif  /* TAO_EC_DISPATCHING_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 2dd758d825d..9f166b240e9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Gateway_IIOP.h
  *
@@ -15,6 +16,7 @@
 
 #ifndef TAO_EC_GATEWAY_IIOP_H
 #define TAO_EC_GATEWAY_IIOP_H
+
 #include /**/ "ace/pre.h"
 
 #include /**/ "event_export.h"
@@ -23,6 +25,7 @@
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/Channel_Clients.h"
 #include "ace/Map_Manager.h"
+#include "ace/Null_Mutex.h"
 
 class TAO_ECG_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP_Factory;
@@ -242,4 +245,5 @@ protected:
 };
 
 #include /**/ "ace/post.h"
+
 #endif /* ACE_EC_GATEWAY_IIOP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index d77e497b2a8..6641559747c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_ObserverStrategy.h
  *
@@ -16,6 +17,7 @@
 
 #ifndef TAO_EC_OBSERVERSTRATEGY_H
 #define TAO_EC_OBSERVERSTRATEGY_H
+
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/ESF/ESF_Worker.h"
@@ -24,6 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Null_Mutex.h"
 #include "ace/RB_Tree.h"
 #include "ace/Map_Manager.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -348,4 +351,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_EC_OBSERVERSTRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 825f3a15165..9fc4f06efa0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -5,11 +5,15 @@
 #include "EC_Supplier_Filter.h"
 #include "EC_Supplier_Filter_Builder.h"
 
+#include "ace/Reverse_Lock_T.h"
+
 #if ! defined (__ACE_INLINE__)
 #include "EC_ProxyConsumer.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Event, EC_ProxyConsumer, "$Id$")
+ACE_RCSID (Event,
+           EC_ProxyConsumer,
+           "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 4fddd7cefd1..ea22992bf90 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -11,11 +11,15 @@
 #include "orbsvcs/ESF/ESF_RefCount_Guard.h"
 #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
+#include "ace/Reverse_Lock_T.h"
+
 #if ! defined (__ACE_INLINE__)
 #include "EC_ProxySupplier.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Event, EC_ProxySupplier, "$Id$")
+ACE_RCSID (Event,
+           EC_ProxySupplier,
+           "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 2ca39620f85..5316768a944 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -12,11 +12,14 @@
 #include "tao/Object_KeyC.h"
 
 #include "ace/Auto_Ptr.h"
+#include "ace/Lock_Adapter_T.h"
+
 
 ACE_RCSID (IFR_Service,
            Repository_i,
            "$Id$")
 
+
 TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb,
                                     PortableServer::POA_ptr poa,
                                     ACE_Configuration *config)
@@ -93,7 +96,7 @@ TAO_Repository_i::lookup_id_i (const char *search_id
   CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (def_kind,
                                           path.c_str (),
                                           this->repo_
@@ -208,7 +211,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
         }
       else
         {
-          TAO_IDLType_i *impl = 
+          TAO_IDLType_i *impl =
             TAO_IFR_Service_Utils::path_to_idltype (path,
                                                     this);
           impl->section_key (key);
@@ -227,7 +230,7 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
 
   obj_id += this->pkind_to_string (kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Primitive,
                                           obj_id.c_str (),
                                           this->repo_
@@ -287,7 +290,7 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound
   ACE_TString obj_id ("strings\\");
   obj_id += name;
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_String,
                                           obj_id.c_str (),
                                           this->repo_
@@ -347,7 +350,7 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound
   ACE_TString obj_id ("wstrings\\");
   obj_id += name;
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Wstring,
                                                obj_id.c_str (),
                                                this->repo_
@@ -421,7 +424,7 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
   ACE_TString obj_id ("sequences\\");
   obj_id += name;
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Sequence,
                                           obj_id.c_str (),
                                           this->repo_
@@ -495,7 +498,7 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
   ACE_TString obj_id ("arrays\\");
   obj_id += name;
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Array,
                                           obj_id.c_str (),
                                           this->repo_
@@ -769,20 +772,20 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
 
   // ID Assignment Policy.
   policies[0] =
-    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID 
+    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Lifespan Policy.
   policies[1] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT 
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1); 
+  ACE_CHECK_RETURN (-1);
 
   // Request Processing Policy.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
-        PortableServer::USE_DEFAULT_SERVANT 
+        PortableServer::USE_DEFAULT_SERVANT
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK_RETURN (-1);
@@ -790,7 +793,7 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
   // Servant Retention Policy.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
-        PortableServer::NON_RETAIN 
+        PortableServer::NON_RETAIN
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK_RETURN (-1);
@@ -798,7 +801,7 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
   // Id Uniqueness Policy.
   policies[4] =
     this->root_poa_->create_id_uniqueness_policy (
-        PortableServer::MULTIPLE_ID 
+        PortableServer::MULTIPLE_ID
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK_RETURN (-1);
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 3e75059b65e..14fb7f5c398 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -28,6 +28,7 @@
 #include "orbsvcs/DsLogAdminC.h"
 #include "ace/Containers.h"
 #include "ace/Hash_Map_Manager.h"
+#include "ace/Null_Mutex.h"
 #include "log_export.h"
 
 #define LOG_DEFAULT_MAX_REC_LIST_LEN 30
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
index e1802a052b3..c319ed8a93e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
@@ -24,6 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/DsLogAdminC.h"
+#include "ace/Mutex.h"
 
 #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index 166a3dbb214..aabc45f5e72 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -22,6 +22,7 @@
 #include "orbsvcs/CosNotificationC.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/SString.h"
+#include "ace/Null_Mutex.h"
 
 /**
  * @class TAO_Notify_PropertySeq
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index f5b409f914a..5885ce6d841 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -1,21 +1,18 @@
-/* -*- C++ -*- */
-// $Id$
+// -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   CosPropertyService_i.h
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CosPropertyService_i.h
+ *
+ *  $Id$
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_COSPROPERTYSERVICE_I_H
+#define TAO_COSPROPERTYSERVICE_I_H
 
-#ifndef COSPROPERTYSERVICE_I_H
-#define COSPROPERTYSERVICE_I_H
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/Property/property_export.h"
@@ -27,6 +24,7 @@
 #include "orbsvcs/CosPropertyServiceS.h"
 
 #include "ace/Hash_Map_Manager.h"
+#include "ace/Null_Mutex.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -613,4 +611,5 @@ private:
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
-#endif /* COSPROPERTYSERVICE_I_H */
+
+#endif  /* TAO_COSPROPERTYSERVICE_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 984f89f0052..b3fcf71b250 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/OS.h"
 #include "ace/Singleton.h"
+#include "ace/Null_Mutex.h"
 
 #include "orbsvcs/Runtime_Scheduler.h"
 #include "orbsvcs/Scheduler_Factory.h"
@@ -10,7 +11,9 @@
 #include "orbsvcs/Scheduler_Factory.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(orbsvcs, Scheduler_Factory, "$Id$")
+ACE_RCSID(orbsvcs,
+          Scheduler_Factory,
+          "$Id$")
 
 // Initialize static class members.
 RtecScheduler::Scheduler_ptr ACE_Scheduler_Factory::server_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index 42ed027dbd8..c926f3d6fb3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- * @author 
+ * @author
  */
 //=============================================================================
 
@@ -16,6 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Hash_Map_Manager.h"
+#include "ace/Null_Mutex.h"
 #include "tao/corba.h"
 #include "orbsvcs/Trader/trading_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index cdca0ebf546..4ec7cfef179 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -17,6 +17,7 @@
 
 #include "Trader.h"
 #include "Offer_Iterators.h"
+#include "ace/Null_Mutex.h"
 
 template <class LOCK_TYPE> class TAO_Service_Offer_Iterator;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 976512802fa..88a868e027d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -18,6 +18,7 @@
 
 #include "Trader.h"
 #include "ace/Hash_Map_Manager.h"
+#include "ace/Null_Mutex.h"
 
 /**
  * @class TAO_Service_Type_Repository
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 997c9e2567d..5a0db26616c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -2,11 +2,15 @@
 
 #include "Trader.h"
 #include "Offer_Iterators_T.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/RW_Thread_Mutex.h"
 
 // The following #include is needed only for the instantiation pragmas.
 #include "Trader_Interfaces.h"
 
-ACE_RCSID(Trader, Trader, "$Id$")
+ACE_RCSID (Trader,
+           Trader,
+           "$Id$")
 
 TAO_Trader_Base::TAO_Trader_Base (void)
   : trading_components_ (*this),
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index 9808e7933f3..f086ab3ca92 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -20,10 +20,11 @@
 #include "Trader.h"
 #include "Offer_Database.h"
 #include "ace/Containers.h"
+#include "ace/Lock_Adapter_T.h"
 
-  // *************************************************************
-  // TAO_Trader
-  // *************************************************************
+// *************************************************************
+// TAO_Trader
+// *************************************************************
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 6bcb703cc40..bd99c2682d8 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,6 +13,7 @@
 
 #ifndef TAO_TRADER_UTILS_H
 #define TAO_TRADER_UTILS_H
+
 #include /**/ "ace/pre.h"
 
 #include "Trader.h"
@@ -181,8 +182,8 @@ private:
  * @brief Little helper class that you can extend to have your dynamic
  * property handler construct CosTradingDynamic::DynamicProp structs.
  */
-class TAO_Trading_Export TAO_Dynamic_Property 
-  : public virtual POA_CosTradingDynamic::DynamicPropEval, 
+class TAO_Trading_Export TAO_Dynamic_Property
+  : public virtual POA_CosTradingDynamic::DynamicPropEval,
     public virtual PortableServer::RefCountServantBase
 {
 public:
@@ -775,4 +776,5 @@ private:
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_TRADER_UTILS_H */