ChangeLogTag: Thu Dec 9 18:39:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

22 files changed, 482 insertions, 267 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f09d7144234..a5d3080f0d5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,49 @@
+Thu Dec  9 18:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ParameterMode.pidl:
+          Moved the enum ParameterMode to its own file
+
+        * tao/orb.idl:
+          Removed enum ParameterMode and include ParameterMode.pidl
+
+        * tao/ParameterMode.{h,cpp}:
+          Removed these files
+
+        * tao/ParameterModeC.{h,cpp}:
+          Added new generated files
+
+        * tao/DomainC.cpp:
+          Removed include of ParameterMode.cpp, it is not needed and will be
+          gone with the next regeneration
+
+        * tao/Dynamic_Parameter.pidl:
+          Added include of ParameterMode.pidl and removed include of orb.idl
+
+        * tao/Dynamic_ParameterC.{h,cpp,i,inl}:
+        * tao/Dynamic_ParameterA.cpp:
+          Regenerated and replaced i with inl file
+
+        * tao/Makefile.am:
+          Updated for changes above
+
+        * tao/tao.mpc:
+          Updated for changes above
+
+        * tao/IFR_Client/IFR_Basic.pidl:
+          Added include of ParameterMode.pidl
+
+        * tao/IFR_Client/IFR_BasicC.h:
+          Replaced include ParameterMode.h with ParameterModeC.h
+
+        * TAO_IDL/ast/ast_decl.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/util/utl_global.cpp:
+          Removed special handling of ParameterMode, it is now in a separate
+          pidl file and included in orb.idl. Normal users could just use orb.idl
+          but if you are worried about your footprint, include
+          ParameterMode.pidl directly.
+
 Thu Dec  9 07:33:16 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp:
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index d7c6a619cba..f877e5ef2c9 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -93,8 +93,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
-ACE_RCSID (ast, 
-           ast_decl, 
+ACE_RCSID (ast,
+           ast_decl,
            "$Id$")
 
 COMMON_Base::COMMON_Base (idl_bool local,
@@ -296,7 +296,7 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value,
       AST_Decl *tmp = 0;
       UTL_Scope *s_tmp = 0;
 
-      for (UTL_ScopeActiveIterator i (s, UTL_Scope::IK_decls); 
+      for (UTL_ScopeActiveIterator i (s, UTL_Scope::IK_decls);
            !i.is_done ();
            i.next ())
         {
@@ -355,8 +355,8 @@ AST_Decl::compute_full_name (void)
       long second = I_FALSE;
       char *name = 0;
 
-      for (UTL_IdListActiveIterator i (this->name ()); 
-           !i.is_done (); 
+      for (UTL_IdListActiveIterator i (this->name ());
+           !i.is_done ();
            i.next ())
         {
           if (!first)
@@ -393,8 +393,8 @@ AST_Decl::compute_full_name (void)
       first = I_TRUE;
       second = I_FALSE;
 
-      for (UTL_IdListActiveIterator j (this->name ()); 
-           !j.is_done (); 
+      for (UTL_IdListActiveIterator j (this->name ());
+           !j.is_done ();
            j.next ())
         {
           if (!first)
@@ -484,8 +484,8 @@ AST_Decl::compute_repoID (void)
       namelen += 4;
     }
 
-  for (UTL_IdListActiveIterator i (this->name ()); 
-       !i.is_done (); 
+  for (UTL_IdListActiveIterator i (this->name ());
+       !i.is_done ();
        i.next ())
     {
       if (!first)
@@ -540,12 +540,12 @@ AST_Decl::compute_repoID (void)
 
       ACE_OS::strcat (this->repoID_, "/");
     }
-  
+
   first = I_TRUE;
   second = I_FALSE;
 
-  for (UTL_IdListActiveIterator j (this->name ()); 
-       !j.is_done (); 
+  for (UTL_IdListActiveIterator j (this->name ());
+       !j.is_done ();
        j.next ())
     {
       if (!first)
@@ -869,7 +869,7 @@ AST_Decl::repoID (char *value)
       delete [] this->repoID_;
       this->repoID_ = 0;
     }
-    
+
   this->repoID_ = value;
 }
 
@@ -933,14 +933,14 @@ AST_Decl::version (char *value)
     {
       delete [] this->version_;
       this->version_ = value;
-      
+
       // Repo id is now computed eagerly, so a version set must update
       // is as well.
       if (this->repoID_ != 0)
         {
           ACE_CString tmp (this->repoID_);
           int pos = tmp.rfind (':');
-          
+
           if (pos != ACE_CString::npos)
             {
               tmp = tmp.substr (0, pos + 1) + value;
@@ -994,7 +994,7 @@ AST_Decl::set_id_with_typeid (char *value)
   {
     case AST_Decl::NT_field:
       {
-        AST_Interface *iface = 
+        AST_Interface *iface =
           AST_Interface::narrow_from_scope (this->defined_in ());
 
         if (iface == 0 || iface->node_type () == AST_Decl::NT_valuetype == 0)
@@ -1343,13 +1343,6 @@ void
 AST_Decl::last_referenced_as (UTL_ScopedName *n)
 {
   this->last_referenced_as_ = n;
-
-  if (idl_global->in_main_file ()
-      && ACE_OS::strcmp (n->last_component ()->get_string (),
-                         "ParameterMode") == 0)
-    {
-      idl_global->parametermode_seen_ = true;
-    }
 }
 
 UTL_Scope *
@@ -1365,7 +1358,7 @@ AST_Decl::prefix_scope (UTL_Scope *s)
 }
 
 // Container types will override this.
-int 
+int
 AST_Decl::contains_wstring (void)
 {
   if (this->contains_wstring_ == -1)
@@ -1375,7 +1368,7 @@ AST_Decl::contains_wstring (void)
           case AST_Decl::NT_array:
             {
               AST_Array *a = AST_Array::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 a->base_type ()->contains_wstring ();
               break;
             }
@@ -1384,14 +1377,14 @@ AST_Decl::contains_wstring (void)
           case AST_Decl::NT_union:
             {
               AST_Structure *s = AST_Structure::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 s->contains_wstring ();
               break;
             }
           case AST_Decl::NT_sequence:
             {
               AST_Sequence *s = AST_Sequence::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 s->base_type ()->contains_wstring ();
               break;
             }
@@ -1400,14 +1393,14 @@ AST_Decl::contains_wstring (void)
           case AST_Decl::NT_union_branch:
             {
               AST_Field *f = AST_Field::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 f->field_type ()->contains_wstring ();
               break;
             }
           case AST_Decl::NT_typedef:
             {
               AST_Typedef *td = AST_Typedef::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 td->primitive_base_type ()->contains_wstring ();
               break;
             }
@@ -1424,7 +1417,7 @@ AST_Decl::contains_wstring (void)
 }
 
 // Non-virtual - no need to override this one.
-void 
+void
 AST_Decl::contains_wstring (int val)
 {
   this->contains_wstring_ = val;
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index f93ec62483e..c58e89e6d40 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1424,13 +1424,6 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
       this->client_header_
     );
 
-  // ParameterMode is so rarely used, it was put in a separate TAO file.
-  this->gen_cond_file_include (
-      idl_global->parametermode_seen_,
-      "tao/ParameterMode.h",
-      this->client_header_
-    );
-
   // Include the Messaging library entry point, if AMI is enabled.
   if (be_global->ami_call_back () == I_TRUE)
     {
@@ -1544,8 +1537,8 @@ TAO_CodeGen::gen_stub_src_includes (void)
                                   "tao/ORB_Core.h");
     }
 
-  // We generate this include if we 
-  // have typecode support 
+  // We generate this include if we
+  // have typecode support
   // AND have not already included it in the header file
   // OR a TypeCode or TCKind reference is not seen
   //    AND we are not generating typecodes in a separate file.
@@ -1606,7 +1599,7 @@ TAO_CodeGen::gen_skel_src_includes (void)
     {
       return;
     }
-    
+
   this->gen_standard_include (this->server_skeletons_,
                               "tao/PortableServer/Object_Adapter.h");
   this->gen_standard_include (this->server_skeletons_,
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 83624a8cf9e..0f6de0c430f 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -299,7 +299,6 @@ public:
   bool object_arg_seen_;
   bool octet_seq_seen_;
   bool operation_seen_;
-  bool parametermode_seen_;
   bool pseudo_seq_seen_;
   bool seq_seen_;
   bool short_seq_seen_;
@@ -523,17 +522,17 @@ public:
   ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> &
   file_prefixes (void);
   // Accessor for the IDL file prefix container.
-  
+
   idl_bool pass_orb_idl (void) const;
   void pass_orb_idl (idl_bool val);
   // Accessor for the pass_orb_idl_ member.
-  
+
   bool using_ifr_backend (void) const;
   void using_ifr_backend (bool val);
-  
+
   int check_gperf (void);
   // Currently called only from IDL backend, but could be useful elsewhere.
-  
+
   void fini (void);
   // Do final cleanup just before process exits.
 
@@ -581,7 +580,7 @@ private:
 
   char *tao_root_;
   // Needed if orb.idl is included.
-  
+
   char *gperf_path_;
   // Path for the perfect hash generator(gperf) program. Default
   // is $ACE_ROOT/bin/gperf.
@@ -621,10 +620,10 @@ private:
 
   ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> file_prefixes_;
   // Associates a prefix with a file.
-  
+
   idl_bool pass_orb_idl_;
   // Treat orb.idl like any other included IDL file.
-  
+
   bool using_ifr_backend_;
   // Set by the IFR backend itself.
 };
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 96d4f23a103..9af235781a1 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -135,7 +135,7 @@ IDL_GlobalData::IDL_GlobalData (void)
   // in the environment.
   // Form the absolute pathname.
   char* ace_root = ACE_OS::getenv ("ACE_ROOT");
-  
+
   if (ace_root == 0)
     // This may not cause any problem if -g option is used to specify
     // the correct path for the  gperf program. Let us ignore this
@@ -229,7 +229,6 @@ IDL_GlobalData::reset_flag_seen (void)
   object_arg_seen_ = false;
   octet_seq_seen_ = false;
   operation_seen_ = false;
-  parametermode_seen_ = false;
   pseudo_seq_seen_ = false;
   seq_seen_ = false;
   short_seq_seen_ = false;
@@ -1008,7 +1007,7 @@ IDL_GlobalData::destroy (void)
       delete [] trash;
       trash = 0;
     }
-    
+
   for (unsigned long j = 0; j < this->pd_n_include_file_names; ++j)
     {
       // Delete the contained char* but not the UTL_String -
@@ -1016,15 +1015,15 @@ IDL_GlobalData::destroy (void)
       this->pd_include_file_names[j]->destroy ();
       this->pd_include_file_names[j] = 0;
     }
-    
+
   this->pd_n_include_file_names = 0;
-  
+
   for (size_t k = 0; k < n_included_idl_files_; ++k)
     {
       // No memory allocated for these, so just set to 0.
       this->included_idl_files_[k] = 0;
     }
-    
+
   this->n_included_idl_files_ = 0;
 
   this->pd_root->destroy ();
@@ -1432,14 +1431,14 @@ IDL_GlobalData::create_uses_multiple_stuff (
   struct_name += "Connection";
   Identifier struct_id (struct_name.c_str ());
   UTL_ScopedName sn (&struct_id, 0);
-  AST_Structure *connection = 
+  AST_Structure *connection =
     idl_global->gen ()->create_structure (&sn, 0, 0);
   struct_id.destroy ();
-  
+
   Identifier object_id ("objref");
   UTL_ScopedName object_name (&object_id,
                               0);
-  AST_Field *object_field = 
+  AST_Field *object_field =
     idl_global->gen ()->create_field (pd.impl,
                                       &object_name,
                                       AST_Field::vis_NA);
@@ -1465,7 +1464,7 @@ IDL_GlobalData::create_uses_multiple_stuff (
     }
 
   AST_ValueType *cookie = AST_ValueType::narrow_from_decl (d);
-  
+
   Identifier cookie_id ("ck");
   UTL_ScopedName cookie_name (&cookie_id,
                               0);
@@ -1475,9 +1474,9 @@ IDL_GlobalData::create_uses_multiple_stuff (
                                       AST_Field::vis_NA);
   (void) DeclAsScope (connection)->fe_add_field (cookie_field);
   cookie_id.destroy ();
-  
+
   (void) c->fe_add_structure (connection);
-  
+
   ACE_UINT64 bound = 0;
   AST_Expression *bound_expr =
     idl_global->gen ()->create_expr (bound,
@@ -1488,7 +1487,7 @@ IDL_GlobalData::create_uses_multiple_stuff (
                                          0,
                                          0,
                                          0);
-                                         
+
   ACE_CString seq_string (pd.id->get_string ());
   seq_string += "Connections";
   Identifier seq_id (seq_string.c_str ());
@@ -1500,6 +1499,6 @@ IDL_GlobalData::create_uses_multiple_stuff (
                                         0,
                                         0);
   seq_id.destroy ();
-  
+
   (void) c->fe_add_typedef (connections);
 }
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 8da6882f61d..3e86cca0385 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -40,7 +40,6 @@
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "ORB_Core.h"
-#include "ParameterMode.h"
 #include "DynamicC.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/Dynamic_Parameter.pidl b/TAO/tao/Dynamic_Parameter.pidl
index 967726e1f46..ebd34801121 100644
--- a/TAO/tao/Dynamic_Parameter.pidl
+++ b/TAO/tao/Dynamic_Parameter.pidl
@@ -26,11 +26,11 @@
 // Piece of module Dynamic generated separately for use by
 // template argument helper classes.
 
-#include <orb.idl>
-
 #ifndef _DYNAMIC_PARAMETER_IDL_
 #define _DYNAMIC_PARAMETER_IDL_
 
+#include <ParameterMode.pidl>
+
 module Dynamic
 {
   struct Parameter
diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp
index e6c2c3cc0c5..1b8a1e17db2 100644
--- a/TAO/tao/Dynamic_ParameterA.cpp
+++ b/TAO/tao/Dynamic_ParameterA.cpp
@@ -27,68 +27,70 @@
 
 #include "Dynamic_ParameterC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_Dynamic_Parameter[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d69632f),
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d69632f), 
+  ACE_NTOHL (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
     10,
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x72000000),  // name = Parameter
   2, // member count
     9,
-  ACE_NTOHL (0x61726775),
-  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x61726775), 
+  ACE_NTOHL (0x6d656e74), 
   ACE_NTOHL (0x0),  // name = argument
     CORBA::tk_any,
 
   5,
-  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5061),
-    ACE_NTOHL (0x72616d65),
-    ACE_NTOHL (0x7465724d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5061), 
+    ACE_NTOHL (0x72616d65), 
+    ACE_NTOHL (0x7465724d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
     14,
-    ACE_NTOHL (0x50617261),
-    ACE_NTOHL (0x6d657465),
-    ACE_NTOHL (0x724d6f64),
+    ACE_NTOHL (0x50617261), 
+    ACE_NTOHL (0x6d657465), 
+    ACE_NTOHL (0x724d6f64), 
     ACE_NTOHL (0x65000000),  // name = ParameterMode
     3, // member count
     9,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x0),  // name = PARAM_IN
     10,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f4f55),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f4f55), 
     ACE_NTOHL (0x54000000),  // name = PARAM_OUT
     12,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
@@ -96,7 +98,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
     sizeof (_oc_Dynamic_Parameter),
     (char *) &_oc_Dynamic_Parameter,
     0,
-    sizeof (Dynamic::Parameter)
+    0
   );
 
 namespace Dynamic
@@ -105,7 +107,7 @@ namespace Dynamic
     &_tc_TAO_tc_Dynamic_Parameter;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -142,8 +144,8 @@ CORBA::Boolean operator>>= (
     Dynamic::Parameter *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const Dynamic::Parameter *&,
+  return _tao_any >>= const_cast<
+      const Dynamic::Parameter *&> (
       _tao_elem
     );
 }
@@ -163,8 +165,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -179,5 +179,4 @@ CORBA::Boolean operator>>= (
         Dynamic::Parameter \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
index 9929690a4f9..b1af4faf993 100644
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ b/TAO/tao/Dynamic_ParameterC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Dynamic_ParameterC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Dynamic_ParameterC.i"
+#include "Dynamic_ParameterC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -59,7 +58,7 @@ Dynamic::Parameter::_tao_any_destructor (
   )
 {
   Parameter *_tao_tmp_pointer =
-    ACE_static_cast (Parameter *, _tao_void_pointer);
+    static_cast<Parameter *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -87,7 +86,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -126,4 +125,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h
index e740dbb6ca5..bdf8ff3f262 100644
--- a/TAO/tao/Dynamic_ParameterC.h
+++ b/TAO/tao/Dynamic_ParameterC.h
@@ -26,24 +26,28 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
 #define _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ParameterMode.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Any.h"
 #include "tao/VarOut_T.h"
 
+#include "tao/ParameterModeC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -57,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,40 +74,40 @@
 
 namespace Dynamic
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Parameter;
-  
+
   typedef
     TAO_Var_Var_T<
         Parameter
       >
     Parameter_var;
-  
+
   typedef
     TAO_Out_T<
         Parameter,
         Parameter_var
       >
     Parameter_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export Parameter
   {
     typedef Parameter_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::Any argument;
     CORBA::ParameterMode mode;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
 
 // TAO_IDL - Generated from
@@ -136,13 +138,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "Dynamic_ParameterC.i"
+#include "Dynamic_ParameterC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -154,3 +156,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Dynamic_ParameterC.i b/TAO/tao/Dynamic_ParameterC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/Dynamic_ParameterC.i
+++ b/TAO/tao/Dynamic_ParameterC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index d380457b53f..4f15d777b8f 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -55,6 +55,7 @@
 #define _IFR_BASIC_IDL_
 
 #include "IFR_Base.pidl"
+#include "ParameterMode.pidl"
 
 module CORBA
 {
@@ -203,14 +204,14 @@ module CORBA
     attribute IDLType element_type_def;
   };
 
-  interface ArrayDef : IDLType 
+  interface ArrayDef : IDLType
   {
   attribute unsigned long length;
   readonly attribute TypeCode element_type;
   attribute IDLType element_type_def;
   };
 
-  interface ExceptionDef : Contained, Container 
+  interface ExceptionDef : Contained, Container
   {
     readonly attribute TypeCode type;
     attribute StructMemberSeq members;
@@ -218,20 +219,20 @@ module CORBA
 
   typedef sequence <ExceptionDef> ExceptionDefSeq;
 
-  enum AttributeMode 
+  enum AttributeMode
   {
-    ATTR_NORMAL, 
+    ATTR_NORMAL,
     ATTR_READONLY
   };
 
-  interface AttributeDef : Contained 
+  interface AttributeDef : Contained
   {
     readonly attribute TypeCode type;
     attribute IDLType type_def;
     attribute AttributeMode mode;
   };
 
-  struct AttributeDescription 
+  struct AttributeDescription
   {
     Identifier name;
     RepositoryId id;
@@ -241,7 +242,7 @@ module CORBA
     AttributeMode mode;
   };
 
-  struct ExtAttributeDescription 
+  struct ExtAttributeDescription
   {
     Identifier name;
     RepositoryId id;
@@ -253,7 +254,7 @@ module CORBA
     ExcDescriptionSeq put_exceptions;
   };
 
-  interface ExtAttributeDef : AttributeDef 
+  interface ExtAttributeDef : AttributeDef
   {
     // read/write interface
     attribute ExcDescriptionSeq get_exceptions;
@@ -262,22 +263,22 @@ module CORBA
     ExtAttributeDescription describe_attribute ();
   };
 
-  enum OperationMode 
+  enum OperationMode
   {
-    OP_NORMAL, 
+    OP_NORMAL,
     OP_ONEWAY
   };
 
 // Already defined in corbafwd.h, included from orb.idl
 /*
-  enum ParameterMode 
+  enum ParameterMode
   {
-    PARAM_IN, 
-    PARAM_OUT, 
+    PARAM_IN,
+    PARAM_OUT,
     PARAM_INOUT
   };
 */
-  struct ParameterDescription 
+  struct ParameterDescription
   {
     Identifier name;
     TypeCode type;
@@ -289,7 +290,7 @@ module CORBA
   typedef Identifier ContextIdentifier;
   typedef sequence <ContextIdentifier> ContextIdSeq;
 
-  interface OperationDef : Contained 
+  interface OperationDef : Contained
   {
     readonly attribute TypeCode result;
     attribute IDLType result_def;
@@ -299,7 +300,7 @@ module CORBA
     attribute ExceptionDefSeq exceptions;
   };
 
-  struct OperationDescription 
+  struct OperationDescription
   {
     Identifier name;
     RepositoryId id;
@@ -317,9 +318,9 @@ module CORBA
   typedef sequence <AttributeDescription> AttrDescriptionSeq;
   typedef sequence <ExtAttributeDescription> ExtAttrDescriptionSeq;
 
-  interface InterfaceDef : Container, 
-			   Contained, 
-			   IDLType 
+  interface InterfaceDef : Container,
+			   Contained,
+			   IDLType
   {
     // read/write interface
     attribute InterfaceDefSeq base_interfaces;
@@ -328,7 +329,7 @@ module CORBA
         in RepositoryId interface_id
       );
 
-    struct FullInterfaceDescription 
+    struct FullInterfaceDescription
     {
       Identifier name;
       RepositoryId id;
@@ -362,7 +363,7 @@ module CORBA
       );
   };
 
-  struct InterfaceDescription 
+  struct InterfaceDescription
   {
     Identifier name;
     RepositoryId id;
@@ -371,10 +372,10 @@ module CORBA
     RepositoryIdSeq base_interfaces;
   };
 
-  interface InterfaceAttrExtension 
+  interface InterfaceAttrExtension
   {
     // read interface
-    struct ExtFullInterfaceDescription 
+    struct ExtFullInterfaceDescription
     {
       Identifier name;
       RepositoryId id;
@@ -401,25 +402,25 @@ module CORBA
   };
 
   interface ExtInterfaceDef : InterfaceDef,
-			      InterfaceAttrExtension 
+			      InterfaceAttrExtension
   {
   };
 
-  interface AbstractInterfaceDef : InterfaceDef 
+  interface AbstractInterfaceDef : InterfaceDef
   {
   };
 
   interface ExtAbstractInterfaceDef : AbstractInterfaceDef,
-				      InterfaceAttrExtension 
+				      InterfaceAttrExtension
   {
   };
 
-  interface LocalInterfaceDef : InterfaceDef 
+  interface LocalInterfaceDef : InterfaceDef
   {
   };
 
   interface ExtLocalInterfaceDef : LocalInterfaceDef,
-				   InterfaceAttrExtension 
+				   InterfaceAttrExtension
   {
   };
 };
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 31319ba79cc..538e77ca570 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -44,13 +44,13 @@
 #include "tao/Object.h"
 #include "tao/Typecode.h"
 #include "tao/Any.h"
-#include "tao/ParameterMode.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
+#include "tao/ParameterModeC.h"
 #include "IFR_BaseC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -76,13 +76,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-  
+
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -92,22 +92,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_PRIMITIVEDEF__VAR_OUT_CH_)
 #define _CORBA_PRIMITIVEDEF__VAR_OUT_CH_
-  
+
   class PrimitiveDef;
   typedef PrimitiveDef *PrimitiveDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PrimitiveDef
       >
     PrimitiveDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PrimitiveDef
@@ -115,22 +115,22 @@ namespace CORBA
     PrimitiveDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_STRINGDEF__VAR_OUT_CH_)
 #define _CORBA_STRINGDEF__VAR_OUT_CH_
-  
+
   class StringDef;
   typedef StringDef *StringDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         StringDef
       >
     StringDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         StringDef
@@ -138,22 +138,22 @@ namespace CORBA
     StringDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_SEQUENCEDEF__VAR_OUT_CH_)
 #define _CORBA_SEQUENCEDEF__VAR_OUT_CH_
-  
+
   class SequenceDef;
   typedef SequenceDef *SequenceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         SequenceDef
       >
     SequenceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         SequenceDef
@@ -161,22 +161,22 @@ namespace CORBA
     SequenceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_ARRAYDEF__VAR_OUT_CH_)
 #define _CORBA_ARRAYDEF__VAR_OUT_CH_
-  
+
   class ArrayDef;
   typedef ArrayDef *ArrayDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ArrayDef
       >
     ArrayDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ArrayDef
@@ -184,16 +184,16 @@ namespace CORBA
     ArrayDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_WSTRINGDEF__VAR_OUT_CH_)
 #define _CORBA_WSTRINGDEF__VAR_OUT_CH_
-  
+
   class WstringDef;
   typedef WstringDef *WstringDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         WstringDef
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 07c7a3ea8a2..59c298b2a01 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -150,7 +150,7 @@ ORB_Core = \
   PICurrent_Copy_Callback.cpp \
   PICurrent_ORBInitializer.cpp \
   PI_ForwardC.cpp \
-  ParameterMode.cpp \
+  ParameterModeC.cpp \
   Parser_Registry.cpp \
   PolicyA.cpp \
   PolicyC.cpp \
@@ -521,7 +521,7 @@ nobase_include_HEADERS += \
   PICurrent_Copy_Callback.h \
   PICurrent_ORBInitializer.h \
   PI_ForwardC.h \
-  ParameterMode.h \
+  ParameterModeC.h \
   Parser_Registry.h \
   Pluggable_Messaging.h \
   Pluggable_Messaging_Utils.h \
@@ -706,7 +706,7 @@ nobase_include_HEADERS += \
   DomainC.i \
   DoubleSeqC.inl \
   DynamicC.inl \
-  Dynamic_ParameterC.i \
+  Dynamic_ParameterC.inl \
   Endpoint.i \
   Environment.i \
   Exception.i \
@@ -785,6 +785,7 @@ nobase_include_HEADERS += \
   OctetSeqC.inl \
   PICurrent.inl \
   PI_ForwardC.inl \
+  ParameterModeC.inl \
   Parser_Registry.i \
   Pluggable_Messaging.i \
   Pluggable_Messaging_Utils.i \
@@ -936,6 +937,7 @@ nobase_include_HEADERS += \
   ObjectIdList.pidl \
   Object_Key.pidl \
   OctetSeq.pidl \
+  ParameterMode.pidl \
   PI_Forward.pidl \
   Policy.pidl \
   Policy_Forward.pidl \
diff --git a/TAO/tao/ParameterMode.cpp b/TAO/tao/ParameterMode.cpp
deleted file mode 100644
index bdf3eb44645..00000000000
--- a/TAO/tao/ParameterMode.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-#include "tao/ParameterMode.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (tao,
-           ParameterMode,
-           "$Id$")
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-
-  if (_tao_result == 1)
-    {
-      _tao_enumval = static_cast<CORBA::ParameterMode> (_tao_temp);
-    }
-
-  return _tao_result;
-}
diff --git a/TAO/tao/ParameterMode.h b/TAO/tao/ParameterMode.h
deleted file mode 100644
index a2648df1595..00000000000
--- a/TAO/tao/ParameterMode.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     ParameterMode.h
- *
- *  $Id$
- *
- *  This enum is used only in the IDL structs Dynamic::Parameter and
- *  CORBA::ParameterDescription.
- *
- *  @author  Jeff Parsons
- */
-//=============================================================================
-
-#ifndef CORBA_PARAMETERMODE_H
-#define CORBA_PARAMETERMODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-namespace CORBA
-{
-  enum ParameterMode
-    {
-      PARAM_IN,
-      PARAM_OUT,
-      PARAM_INOUT
-    };
-}
-
-TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &);
-
-TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
-
-#include /**/ "ace/post.h"
-
-#endif  /* CORBA_PARAMETERMODE_H */
diff --git a/TAO/tao/ParameterMode.pidl b/TAO/tao/ParameterMode.pidl
new file mode 100644
index 00000000000..f3721baa133
--- /dev/null
+++ b/TAO/tao/ParameterMode.pidl
@@ -0,0 +1,37 @@
+// -*- IDL -*-
+
+// ================================================================
+/**
+ *  @file   ParameterMode.pidl
+ *
+ * $Id$
+ *
+ *   This file was used to generate the code in ParameterModeC.* The command
+ *   used to generate code is:
+ *
+ *     tao_idl
+ *        -o orig -Ge 1 -GT -Sc -St
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include="tao/TAO_Export.h"
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          ParameterMode.pidl
+ */
+// ================================================================
+
+#ifndef TAO_PARAMETERMODE_IDL
+#define TAO_PARAMETERMODE_IDL
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+  enum ParameterMode
+  {
+    PARAM_IN,
+    PARAM_OUT,
+    PARAM_INOUT
+  };
+};
+
+#endif /* TAO_PARAMETERMODE_IDL */
diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp
new file mode 100644
index 00000000000..b26210bdc8f
--- /dev/null
+++ b/TAO/tao/ParameterModeC.cpp
@@ -0,0 +1,81 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:302
+
+
+#include "ParameterModeC.h"
+#include "tao/CDR.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ParameterModeC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:65
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<CORBA::ParameterMode> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h
new file mode 100644
index 00000000000..d486aab6eda
--- /dev/null
+++ b/TAO/tao/ParameterModeC.h
@@ -0,0 +1,124 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_PARAMETERMODEC_H_
+#define _TAO_IDL_ORIG_PARAMETERMODEC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_enum/enum_ch.cpp:57
+  
+  enum ParameterMode
+  {
+    PARAM_IN,
+    PARAM_OUT,
+    PARAM_INOUT
+  };
+  
+  typedef ParameterMode &ParameterMode_out;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:963
+
+#if defined (__ACE_INLINE__)
+#include "ParameterModeC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/ParameterModeC.inl b/TAO/tao/ParameterModeC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/ParameterModeC.inl
@@ -0,0 +1,27 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index c8438735aef..faf7744418a 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -33,6 +33,7 @@
 
 #include <tao/Policy.pidl>
 #include <tao/Services.pidl>
+#include <tao/ParameterMode.pidl>
 
 #pragma prefix "omg.org"
 
@@ -100,13 +101,6 @@ module CORBA
     SYSTEM_EXCEPTION
   };
 
-  enum ParameterMode
-  {
-    PARAM_IN,
-    PARAM_OUT,
-    PARAM_INOUT
-  };
-
   typedef short ValueModifier;
   const ValueModifier VM_NONE = 0;
   const ValueModifier VM_CUSTOM = 1;
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 34819bd2bfd..85824fee3a7 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -136,7 +136,7 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
       DynamicA.cpp
       Dynamic_ParameterC.cpp
       Dynamic_ParameterA.cpp
-      ParameterMode.cpp
+      ParameterModeC.cpp
       AnySeqA.cpp
       AnySeqC.cpp
       BooleanSeqA.cpp