#include the .i file in the .h/.cpp files instead of corba.h

1 files changed, 57 insertions, 51 deletions

diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
index adb7601a0e6..15939e72f16 100644
--- a/TAO/tao/Marshal.cpp
+++ b/TAO/tao/Marshal.cpp
@@ -1,8 +1,10 @@
+// $Id$
+
 // ============================================================================
 //
 // = LIBRARY
 //    TAO
-// 
+//
 // = FILENAME
 //    marshal.cpp
 //
@@ -14,13 +16,17 @@
 //
 // = AUTHOR
 //     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and 
+//     and
 //     Aniruddha Gokhale
-// 
+//
 // ============================================================================
 
 #include "tao/corba.h"
 
+#if !defined (__ACE_INLINE__)
+# include "tao/Marshal.i"
+#endif /* ! __ACE_INLINE__ */
+
 TAO_Marshal_Factory* TAO_Marshal::DEFAULT_MARSHAL_FACTORY = 0;
 
 void
@@ -87,59 +93,59 @@ TAO_Marshal_Factory::~TAO_Marshal_Factory (void)
 //
 // Based on the kind of the typecode, return the appropriate marshal object
 TAO_Marshal_Object* TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
-							      CORBA::Environment &env)
+                                                              CORBA::Environment &env)
 {
   env.clear ();
   if (tc)
     {
       switch (tc->kind_)
-	{
-	case CORBA::tk_null:
-	case CORBA::tk_void:
-	case CORBA::tk_short:
-	case CORBA::tk_ushort:
-	case CORBA::tk_long:
-	case CORBA::tk_ulong:
-	case CORBA::tk_float:
-	case CORBA::tk_enum:
-	case CORBA::tk_double:
-	case CORBA::tk_longlong:
-	case CORBA::tk_ulonglong:
-	case CORBA::tk_boolean:
-	case CORBA::tk_char:
-	case CORBA::tk_octet:
-	case CORBA::tk_longdouble:
-	case CORBA::tk_wchar:
-	  return m_primitive_;
-	case CORBA::tk_any:
-	  return m_any_;
-	case CORBA::tk_TypeCode:
-	  return m_typecode_;
-	case CORBA::tk_Principal:
-	  return m_principal_;
-	case CORBA::tk_objref:
-	  return m_objref_;
-	case CORBA::tk_struct:
-	  return m_struct_;
-	case CORBA::tk_union:
-	  return m_union_;
-	case CORBA::tk_string:
-	  return m_string_;
-	case CORBA::tk_sequence:
-	  return m_sequence_;
-	case CORBA::tk_array:
-	  return m_array_;
-	case CORBA::tk_alias:
-	  return m_alias_;
-	case CORBA::tk_except:
-	  return m_except_;
-	case CORBA::tk_wstring:
-	  return m_wstring_;
-	default:
-	  // anything else is an error
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return (TAO_Marshal_Object *)0;
-	}
+        {
+        case CORBA::tk_null:
+        case CORBA::tk_void:
+        case CORBA::tk_short:
+        case CORBA::tk_ushort:
+        case CORBA::tk_long:
+        case CORBA::tk_ulong:
+        case CORBA::tk_float:
+        case CORBA::tk_enum:
+        case CORBA::tk_double:
+        case CORBA::tk_longlong:
+        case CORBA::tk_ulonglong:
+        case CORBA::tk_boolean:
+        case CORBA::tk_char:
+        case CORBA::tk_octet:
+        case CORBA::tk_longdouble:
+        case CORBA::tk_wchar:
+          return m_primitive_;
+        case CORBA::tk_any:
+          return m_any_;
+        case CORBA::tk_TypeCode:
+          return m_typecode_;
+        case CORBA::tk_Principal:
+          return m_principal_;
+        case CORBA::tk_objref:
+          return m_objref_;
+        case CORBA::tk_struct:
+          return m_struct_;
+        case CORBA::tk_union:
+          return m_union_;
+        case CORBA::tk_string:
+          return m_string_;
+        case CORBA::tk_sequence:
+          return m_sequence_;
+        case CORBA::tk_array:
+          return m_array_;
+        case CORBA::tk_alias:
+          return m_alias_;
+        case CORBA::tk_except:
+          return m_except_;
+        case CORBA::tk_wstring:
+          return m_wstring_;
+        default:
+          // anything else is an error
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+          return (TAO_Marshal_Object *)0;
+        }
     }
   else
     {