ChangeLogTag: Tue Nov 16 13:04:12 UTC 2004 Martin Corino <mcorino@remedy.nl>

15 files changed, 41 insertions, 24 deletions

diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 1ff27056605..0a1d56b8ba4 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -8,6 +8,8 @@
 #include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
+#include "tao/SystemException.h"
+#include "tao/CDR.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
index c43dea7e3c3..ec054b374ec 100644
--- a/TAO/tao/BoundsA.cpp
+++ b/TAO/tao/BoundsA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "BoundsC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 63f064731d0..861155eccaf 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -9,6 +9,7 @@
 #include "tao/SystemException.h"
 #include "tao/UTF16_BOM_Factory.h"
 #include "tao/debug.h"
+#include "tao/CDR.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Codeset_Registry.h"
diff --git a/TAO/tao/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset_Translator_Factory.cpp
index a2d660952df..58ee5fb5ada 100644
--- a/TAO/tao/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset_Translator_Factory.cpp
@@ -9,7 +9,7 @@
 //    Codeset_Translator_Factory.cpp
 //
 // = DESCRIPTION
-//    The base for all the translator factories. Translator factories are 
+//    The base for all the translator factories. Translator factories are
 //    responsible for supplying the proper translator on demand.
 //
 // = AUTHORS
@@ -17,7 +17,8 @@
 //
 // ============================================================================
 
-#include "Codeset_Translator_Factory.h"
+#include "tao/Codeset_Translator_Factory.h"
+#include "tao/CDR.h"
 
 ACE_RCSID (tao,
            Codeset_Translator_Factory,
@@ -41,7 +42,7 @@ TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **)
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_InputCDR *cdr, 
+    TAO_InputCDR *cdr,
     ACE_Char_Codeset_Translator *trans
   ) const
 {
@@ -50,7 +51,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_OutputCDR *cdr, 
+    TAO_OutputCDR *cdr,
     ACE_Char_Codeset_Translator *trans
   ) const
 {
@@ -59,7 +60,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_InputCDR *cdr, 
+    TAO_InputCDR *cdr,
     ACE_WChar_Codeset_Translator *trans
   ) const
 {
@@ -68,7 +69,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_OutputCDR *cdr, 
+    TAO_OutputCDR *cdr,
     ACE_WChar_Codeset_Translator *trans
   ) const
 {
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 60d228acfeb..19ab00c3dc2 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -32,6 +32,7 @@
 #include "GIOPC.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
+#include "tao/Any.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -51,10 +52,10 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 GIOP::Version::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -64,10 +65,10 @@ GIOP::Version::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 GIOP::IORAddressingInfo::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -162,10 +163,10 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     {
       return *this;
     }
-  
+
   this->_reset (u.disc_, 0);
   this->disc_ = u.disc_;
-  
+
   switch (this->disc_)
   {
     case 0:
@@ -219,7 +220,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     default:
     break;
   }
-  
+
   return *this;
 }
 
@@ -303,9 +304,9 @@ CORBA::Boolean operator<< (
     {
       return 0;
     }
-  
+
   CORBA::Boolean result = 1;
-  
+
   switch (_tao_union._d ())
   {
     case 0:
@@ -326,7 +327,7 @@ CORBA::Boolean operator<< (
     default:
       break;
   }
-  
+
   return result;
 }
 
@@ -340,16 +341,16 @@ CORBA::Boolean operator>> (
     {
       return 0;
     }
-  
+
   CORBA::Boolean result = 1;
-  
+
   switch (_tao_discriminant)
   {
     case 0:
       {
         CORBA::OctetSeq _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.object_key (_tao_union_tmp);
@@ -361,7 +362,7 @@ CORBA::Boolean operator>> (
       {
         IOP::TaggedProfile _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.profile (_tao_union_tmp);
@@ -373,7 +374,7 @@ CORBA::Boolean operator>> (
       {
         GIOP::IORAddressingInfo _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.ior (_tao_union_tmp);
@@ -385,7 +386,7 @@ CORBA::Boolean operator>> (
       _tao_union._d (_tao_discriminant);
       break;
   }
-  
+
   return result;
 }
 
@@ -480,5 +481,5 @@ CORBA::Boolean operator>> (
         GIOP::TargetAddress_var \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index 71ce086e877..8b1daf136d4 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORManip_Loader.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index 31b5a52dcc6..2c7af6e248c 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "Messaging.h"
+#include "tao/Any.h"
 #include "tao/CDR.h"
 #include "tao/Object_T.h"
 #include "tao/Typecode.h"
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 4a7aa25a200..c6208e7905b 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -7,6 +7,7 @@
 #include "SystemException.h"
 
 #include "ace/Static_Object_Lock.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 
 ACE_RCSID (tao,
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
index 8e78add1e30..ca52f598306 100644
--- a/TAO/tao/PolicyA.cpp
+++ b/TAO/tao/PolicyA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PolicyC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index 05450612758..b825a03d79a 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableInterceptorC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index cc94da26878..448ef21aa35 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableServerC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index df1e0ffcfe9..16f5fcd1c3c 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -19,6 +19,7 @@
 #include "Codeset_Manager.h"
 #include "Codeset_Translator_Factory.h"
 #include "debug.h"
+#include "CDR.h"
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/tao/UTF16_BOM_Factory.cpp b/TAO/tao/UTF16_BOM_Factory.cpp
index e98acb4271c..98f6ed56d7c 100644
--- a/TAO/tao/UTF16_BOM_Factory.cpp
+++ b/TAO/tao/UTF16_BOM_Factory.cpp
@@ -19,6 +19,7 @@
 
 #include "UTF16_BOM_Factory.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Log_Msg.h"
 
 // Instantiate templates that allow discovery of this factory
 // via the Service Manager.
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 1dbd0e94b96..18299880b5a 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -3,7 +3,9 @@
 
 #include "RIR_Narrow.h"
 #include "tao/SystemException.h"
-#include <stdexcept>
+#if defined (ACE_HAS_EXCEPTIONS)
+  #include <stdexcept>
+#endif
 
 ACE_RCSID (Utils,
            RIR_Narror,
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index acec61525a9..a387ab6aa3c 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -29,6 +29,7 @@
 #include "tao/Typecode.h"
 #include "tao/SystemException.h"
 #include "tao/Any_Dual_Impl_T.h"
+#include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/typecode_defn.cpp:290