ChangeLogTag: Sun Dec 29 08:44:06 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

5 files changed, 10 insertions, 5 deletions

diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index 56adaf57084..c5b7e065636 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -13,12 +13,15 @@
 #ifndef TAO_CONDITION_H
 #define TAO_CONDITION_H
 #include "ace/pre.h"
+#include "orbconf.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+class ACE_Time_Value;
+
 
 /**
  * @class TAO_Condition
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index 5d96c6ac8e1..8b0fe141eb4 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -7,6 +7,7 @@
 #include "tao/Exception.h"
 #include "tao/Environment.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Malloc_Base.h"
 
 #if !defined(__ACE_INLINE__)
 #include "FILE_Parser.i"
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 22a4d97ad03..62e933ada9f 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -28,7 +28,7 @@ CORBA::ULong
 TAO_Muxed_TMS::request_id (void)
 {
   // @@ What is a good error return value?
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon,
+  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                     this->lock_, 0);
 
   ++this->request_id_generator_;
@@ -80,7 +80,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id,
 int
 TAO_Muxed_TMS::unbind_dispatcher (CORBA::ULong request_id)
 {
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     ace_mon,
                     this->lock_,
                     -1);
@@ -99,7 +99,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
 
   // Grab the reply dispatcher for this id.
   {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+    ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, -1);
     result = this->dispatcher_table_.unbind (params.request_id_, rd);
 
     if (TAO_debug_level > 8)
@@ -177,7 +177,7 @@ TAO_Muxed_TMS::idle_after_reply (void)
 void
 TAO_Muxed_TMS::connection_closed (void)
 {
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_);
   // @@ This should be done using a mutex, the table
 
   REQUEST_DISPATCHER_TABLE::ITERATOR end =
diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h
index fc942ddb610..893d06440eb 100644
--- a/TAO/tao/Muxed_TMS.h
+++ b/TAO/tao/Muxed_TMS.h
@@ -65,7 +65,7 @@ public:
 
 protected:
   /// Lock to protect the state of this class
-  TAO_SYNCH_MUTEX lock_;
+  TAO_SYNCH_RECURSIVE_MUTEX lock_;
 
   /// Used to generate a different request_id on each call to
   /// request_id().
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 8927d7bd29c..48068a7624e 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -20,6 +20,7 @@
 #include "tao/Principal.h"
 #include "tao/Marshal.h"
 #include "tao/debug.h"
+#include "ace/Malloc_Base.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Typecode.i"