ChangeLogTag:Mon Sep 1 19:13:01 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

5 files changed, 155 insertions, 268 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 8fb43413bd2..c13cc56a5ed 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,11 @@
+Mon Sep  1 19:13:01 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/BiDir_GIOP/BiDirPolicyC.h: 
+	* tao/BiDir_GIOP/BiDirPolicyC.cpp:
+	* tao/BiDir_GIOP/BiDirPolicyC.i: Regenerated the files. 
+
+	* tao/BiDir_GIOP/BiDirPolicy.pidl: IMproved documentation.
+
 Mon Sep  1 13:51:32 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/BoundsC.h:
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
index 2d8b3b01aa3..557b50f3936 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -5,7 +5,7 @@
 //   BiDirPolicy*.* The command used to generate code
 //   is:
 //
-//     tao_idl -o orig -Ge 1 -Sa -St \
+//     tao_idl -o orig -Ge 1 -GT -Sa -St \
 //          -Wb,export_macro=TAO_BiDirGIOP_Export \
 //          -Wb,export_include="bidirgiop_export.h" \
 //          -Wb,pre_include="ace/pre.h" \
@@ -29,8 +29,8 @@ module BiDirPolicy
   const BidirectionalPolicyValue BOTH = 1;
   const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37;
 
-  // @@ This has ben made local. It was not so in the spec. Any reason
-  //    that this shouldn't be a local interface ?
+  // @@ This has been made local. It was not so in the spec. Any reason
+  //    why this shouldn't be a local interface ?
   local interface BidirectionalPolicy : CORBA::Policy
   {
     readonly attribute BidirectionalPolicyValue value;
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index ac6ee589572..1ad20ed1475 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -15,16 +15,25 @@
 //       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
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+// be/be_codegen.cpp:301
 
 
-#include "BiDirGIOP.h"
-#include "tao/Typecode.h"
+#include "BiDirPolicyC.h"
+#include "tao/Stub.h"
+#include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Basic_Arguments.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -35,62 +44,20 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_arg_traits.cpp:59
 
-static const CORBA::Long _oc_BiDirPolicy_BidirectionalPolicyValue[] =
+// Arg traits specializations.
+namespace TAO
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x42694469), 
-  ACE_NTOHL (0x72506f6c), 
-  ACE_NTOHL (0x6963792f), 
-  ACE_NTOHL (0x42696469), 
-  ACE_NTOHL (0x72656374), 
-  ACE_NTOHL (0x696f6e61), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x69637956), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/BiDirPolicy/BidirectionalPolicyValue:1.0
-    25,
-  ACE_NTOHL (0x42696469), 
-  ACE_NTOHL (0x72656374), 
-  ACE_NTOHL (0x696f6e61), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x69637956), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x0),  // name = BidirectionalPolicyValue
-    CORBA::tk_ushort,
-
 };
 
-static CORBA::TypeCode _tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue (
-    CORBA::tk_alias,
-    sizeof (_oc_BiDirPolicy_BidirectionalPolicyValue),
-    (char *) &_oc_BiDirPolicy_BidirectionalPolicyValue,
-    0,
-    sizeof (BiDirPolicy::BidirectionalPolicyValue)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (BiDirPolicy)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_BidirectionalPolicyValue,
-    &_tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue
-  )
-TAO_NAMESPACE_END
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// be/be_visitor_interface/interface_cs.cpp:60
 
-int BiDirPolicy::BidirectionalPolicy::_tao_class_id = 0;
+// Traits specializations for BiDirPolicy::BidirectionalPolicy.
 
 BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::tao_BidirectionalPolicy_life::tao_duplicate (
+TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_duplicate (
     BiDirPolicy::BidirectionalPolicy_ptr p
   )
 {
@@ -98,7 +65,7 @@ BiDirPolicy::tao_BidirectionalPolicy_life::tao_duplicate (
 }
 
 void
-BiDirPolicy::tao_BidirectionalPolicy_life::tao_release (
+TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_release (
     BiDirPolicy::BidirectionalPolicy_ptr p
   )
 {
@@ -106,67 +73,25 @@ BiDirPolicy::tao_BidirectionalPolicy_life::tao_release (
 }
 
 BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::tao_BidirectionalPolicy_life::tao_nil (
-    void
-  )
+TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_nil (void)
 {
   return BiDirPolicy::BidirectionalPolicy::_nil ();
 }
 
 CORBA::Boolean
-BiDirPolicy::tao_BidirectionalPolicy_life::tao_marshal (
+TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_marshal (
     BiDirPolicy::BidirectionalPolicy_ptr p,
-    TAO_OutputCDR &cdr
+    TAO_OutputCDR & cdr
   )
 {
   return p->marshal (cdr);
 }
 
-BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::tao_BidirectionalPolicy_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-BiDirPolicy::tao_BidirectionalPolicy_cast::tao_upcast (
-    void *src
-  )
-{
-  BiDirPolicy::BidirectionalPolicy **tmp =
-    ACE_static_cast (BiDirPolicy::BidirectionalPolicy **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        BiDirPolicy::BidirectionalPolicy,
-        BiDirPolicy::tao_BidirectionalPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        BiDirPolicy::BidirectionalPolicy,
-        BiDirPolicy::tao_BidirectionalPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        BiDirPolicy::BidirectionalPolicy, \
-        BiDirPolicy::tao_BidirectionalPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        BiDirPolicy::BidirectionalPolicy, \
-        BiDirPolicy::tao_BidirectionalPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*BiDirPolicy__TAO_BidirectionalPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 BiDirPolicy::BidirectionalPolicy::BidirectionalPolicy (void)
 {}
@@ -176,34 +101,14 @@ BiDirPolicy::BidirectionalPolicy::~BidirectionalPolicy (void)
 
 BiDirPolicy::BidirectionalPolicy_ptr
 BiDirPolicy::BidirectionalPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return BidirectionalPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-BiDirPolicy::BidirectionalPolicy_ptr 
-BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return BidirectionalPolicy::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          BidirectionalPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &BidirectionalPolicy::_tao_class_id
-                )
-            )
-        );
+  BidirectionalPolicy_ptr proxy =
+    dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
+  proxy->_add_ref ();
+  return proxy;
 }
 
 BiDirPolicy::BidirectionalPolicy_ptr
@@ -217,49 +122,37 @@ BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj)
   return obj;
 }
 
-void *BiDirPolicy::BidirectionalPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+BiDirPolicy::BidirectionalPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::BiDirPolicy, BidirectionalPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/BiDirPolicy/BidirectionalPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
+      return 1; // success using local knowledge
     }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  else
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 0;
     }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
 }
 
 const char* BiDirPolicy::BidirectionalPolicy::_interface_repository_id (void) const
@@ -274,46 +167,35 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_root/root.cpp:1703
 
-static const CORBA::Long _oc_BiDirPolicy_BidirectionalPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x42694469), 
-  ACE_NTOHL (0x72506f6c), 
-  ACE_NTOHL (0x6963792f), 
-  ACE_NTOHL (0x42696469), 
-  ACE_NTOHL (0x72656374), 
-  ACE_NTOHL (0x696f6e61), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/BiDirPolicy/BidirectionalPolicy:1.0
-    20,
-  ACE_NTOHL (0x42696469), 
-  ACE_NTOHL (0x72656374), 
-  ACE_NTOHL (0x696f6e61), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x69637900),  // name = BidirectionalPolicy
-  };
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-static CORBA::TypeCode _tc_TAO_tc_BiDirPolicy_BidirectionalPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_BiDirPolicy_BidirectionalPolicy),
-    (char *) &_oc_BiDirPolicy_BidirectionalPolicy,
-    0,
-    sizeof (BiDirPolicy::BidirectionalPolicy)
-  );
+  template class
+    TAO_Objref_Var_T<
+        BiDirPolicy::BidirectionalPolicy,
+        TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        BiDirPolicy::BidirectionalPolicy,
+        TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>
+      >;
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (BiDirPolicy)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_BidirectionalPolicy,
-    &_tc_TAO_tc_BiDirPolicy_BidirectionalPolicy
-  )
-TAO_NAMESPACE_END
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        BiDirPolicy::BidirectionalPolicy, \
+        TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        BiDirPolicy::BidirectionalPolicy, \
+        TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy> \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index 90f2e37e926..9928dcdf992 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -15,28 +15,38 @@
 //       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
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+// be/be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_BIDIRPOLICYC_H_
 #define _TAO_IDL_ORIG_BIDIRPOLICYC_H_
 
-#ifndef TAO_BIDIRGIOP_SAFE_INCLUDE
-#error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
-#endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */
-
 #include /**/ "ace/pre.h"
-#include "bidirgiop_export.h"
+
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#include "bidirgiop_export.h"
+#include "tao/Sequence_T.h"
 #include "tao/PolicyC.h"
+#include "tao/Objref_VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -62,46 +72,48 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_root/root_ch.cpp:63
 
-TAO_NAMESPACE  BiDirPolicy
+namespace TAO
 {
+  class Collocation_Proxy_Broker;
+}
 
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:48
 
-  typedef CORBA::UShort BidirectionalPolicyValue;
-  typedef CORBA::UShort_out BidirectionalPolicyValue_out;
+namespace BiDirPolicy
+{
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typedef/typedef_ch.cpp:333
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BidirectionalPolicyValue;
+  typedef CORBA::UShort BidirectionalPolicyValue;
+  typedef CORBA::UShort_out BidirectionalPolicyValue_out;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const BiDirPolicy::BidirectionalPolicyValue NORMAL = 0U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const BiDirPolicy::BidirectionalPolicyValue BOTH = 1U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
 
   const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37U;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // be/be_interface.cpp:601
 
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__ODDS_N_ENDS_CH_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY__ODDS_N_ENDS_CH_
+#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_)
+#define _BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_
 
   class BidirectionalPolicy;
   typedef BidirectionalPolicy *BidirectionalPolicy_ptr;
-  struct tao_BidirectionalPolicy_life;
 
   typedef
     TAO_Objref_Var_T<
@@ -115,30 +127,10 @@ TAO_NAMESPACE  BiDirPolicy
       >
     BidirectionalPolicy_out;
 
-  struct TAO_BiDirGIOP_Export tao_BidirectionalPolicy_life
-  {
-    static BidirectionalPolicy_ptr tao_duplicate (BidirectionalPolicy_ptr);
-    static void tao_release (BidirectionalPolicy_ptr);
-    static BidirectionalPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        BidirectionalPolicy_ptr,
-        TAO_OutputCDR &
-      );
-  };
-
-  struct TAO_BiDirGIOP_Export tao_BidirectionalPolicy_cast
-  {
-    static BidirectionalPolicy_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_
@@ -149,7 +141,6 @@ TAO_NAMESPACE  BiDirPolicy
   public:
     typedef BidirectionalPolicy_ptr _ptr_type;
     typedef BidirectionalPolicy_var _var_type;
-    static int _tao_class_id;
 
     // The static operations.
     static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj);
@@ -159,11 +150,6 @@ TAO_NAMESPACE  BiDirPolicy
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    static BidirectionalPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
     static BidirectionalPolicy_ptr _nil (void)
       {
         return (BidirectionalPolicy_ptr)0;
@@ -172,7 +158,7 @@ TAO_NAMESPACE  BiDirPolicy
 
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual BiDirPolicy::BidirectionalPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -182,9 +168,12 @@ TAO_NAMESPACE  BiDirPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // be/be_visitor_interface/interface_ch.cpp:185
 
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
@@ -200,29 +189,31 @@ TAO_NAMESPACE  BiDirPolicy
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:66
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BidirectionalPolicy;
+} // module BiDirPolicy
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+// be/be_visitor_traits.cpp:48
 
-}
-TAO_NAMESPACE_CLOSE // module BiDirPolicy
+// Traits specializations.
+namespace TAO
+{
+};
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// be/be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "BiDirPolicyC.i"
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
index 2e97c7281c6..89ce805e61c 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
@@ -15,13 +15,19 @@
 //       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
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// be/be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_