ChangeLogTag:Thu Aug 28 18:35:44 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

5 files changed, 23 insertions, 24 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index dda902be6cf..1bbe92c9b5b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,11 +1,11 @@
-Thu Aug 28 18:31:02 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Thu Aug 28 18:35:44 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* tao/Acceptor_Impl.cpp:
 
 	  Include "tao/debug.h" for TAO_debug_level global variable.
 
 	* tao/Any_Impl_T.cpp:
-	* tao/Any_Basic_Impl_T.cpp: 
+	* tao/Any_Basic_Impl_T.cpp:
 	* tao/Any_Special_Impl_T.cpp:
 
 	  Include "tao/Environment.h" for CORBA::Environment class.
diff --git a/TAO/tao/Any_Basic_Impl_T.cpp b/TAO/tao/Any_Basic_Impl_T.cpp
index faf518b2550..21295dde6e0 100644
--- a/TAO/tao/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/Any_Basic_Impl_T.cpp
@@ -5,7 +5,7 @@
 
 #include "tao/Any_Basic_Impl_T.h"
 #include "tao/Marshal.h"
-#include "tao/debug.h"
+#include "tao/Environment.h"
 #include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
 
@@ -31,7 +31,7 @@ TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
 {
 }
 
-template<typename T> 
+template<typename T>
 void
 TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
                                   CORBA::TypeCode_ptr tc,
@@ -44,7 +44,7 @@ TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
   any.replace (new_impl);
 }
 
-template<typename T> 
+template<typename T>
 CORBA::Boolean
 TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
                                    CORBA::TypeCode_ptr tc,
@@ -80,9 +80,9 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
           return 1;
         }
 
-      TAO::Any_Basic_Impl_T<T> *replacement = 
+      TAO::Any_Basic_Impl_T<T> *replacement =
         TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
-                      
+
       auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
 
       TAO_InputCDR cdr (mb->data_block (),
@@ -110,11 +110,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
-template<typename T> 
+template<typename T>
 TAO::Any_Basic_Impl_T<T> *
 TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
 {
@@ -126,8 +126,8 @@ TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
   return retval;
 }
 
-template<typename T> 
-void 
+template<typename T>
+void
 TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
                                        ACE_ENV_ARG_DECL)
 {
@@ -138,4 +138,3 @@ TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
 }
 
 #endif /* TAO_ANY_BASIC_IMPL_T_C */
-
diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp
index 6ba7484fd8f..5e4e654e097 100644
--- a/TAO/tao/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/Any_Dual_Impl_T.cpp
@@ -7,7 +7,7 @@
 #include "tao/Marshal.h"
 #include "tao/CORBA_String.h"
 #include "tao/Environment.h"
-
+#include "tao/CDR.h"
 #include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp
index 650be990b37..d7b1ccd5eaf 100644
--- a/TAO/tao/Any_Impl_T.cpp
+++ b/TAO/tao/Any_Impl_T.cpp
@@ -6,6 +6,7 @@
 #include "tao/Any_Impl_T.h"
 #include "tao/Marshal.h"
 #include "tao/CDR.h"
+#include "tao/Environment.h"
 #include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/TAO/tao/Any_Special_Impl_T.cpp b/TAO/tao/Any_Special_Impl_T.cpp
index e5c8b428298..705706d0609 100644
--- a/TAO/tao/Any_Special_Impl_T.cpp
+++ b/TAO/tao/Any_Special_Impl_T.cpp
@@ -5,7 +5,7 @@
 
 #include "tao/Any_Special_Impl_T.h"
 #include "tao/Marshal.h"
-#include "tao/debug.h"
+#include "tao/Environment.h"
 #include "ace/CORBA_macros.h"
 
 #if !defined (__ACE_INLINE__)
@@ -48,7 +48,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
 
   if (bound > 0)
     {
-      CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind, 
+      CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind,
                                             tc->kind_);
       static CORBA::Long _oc_buffer [] =
         {
@@ -91,11 +91,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
   ACE_TRY_NEW_ENV
     {
       CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
-      CORBA::TypeCode_var unaliased_any_type = 
+      CORBA::TypeCode_var unaliased_any_type =
         any_type->unalias (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TCKind any_kind = 
+      CORBA::TCKind any_kind =
         unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -107,7 +107,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
           return 0;
         }
 
-      CORBA::ULong length = 
+      CORBA::ULong length =
         unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -120,7 +120,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
       ACE_Message_Block *mb = impl->_tao_get_cdr ();
 
-      typedef TAO::Any_Special_Impl_T<T, from_T, to_T> 
+      typedef TAO::Any_Special_Impl_T<T, from_T, to_T>
         BOUNDED_TSTRING_ANY_IMPL;
 
       if (mb == 0)
@@ -147,7 +147,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
                                                 0,
                                                 bound),
                       0);
-                      
+
       auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
           replacement
         );
@@ -178,7 +178,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
     {
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
@@ -196,8 +196,8 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
   this->value_ = 0;
 }
 
-template<typename T, typename from_T, typename to_T> 
-void 
+template<typename T, typename from_T, typename to_T>
+void
 TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
     TAO_InputCDR &cdr
     ACE_ENV_ARG_DECL
@@ -210,4 +210,3 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
 }
 
 #endif /* TAO_ANY_T_C */
-