*** empty log message ***

3 files changed, 3 insertions, 53 deletions

diff --git a/TAO/tao/BiDirPolicy.pidl b/TAO/tao/BiDirPolicy.pidl
deleted file mode 100644
index ae2742d05df..00000000000
--- a/TAO/tao/BiDirPolicy.pidl
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-//
-//   This file was used to generate the code in
-//   BiDirPolicy*.* The command used to generate code
-//   is:
-//
-//     tao_idl \
-//          -Wb,export_macro=TAO_Export \
-//          -Wb,export_include="tao/TAO_Export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          BiDirPolicy.pidl
-//
-//   This is from the GIOP 1.2 spec for Bi Dir IIOP.
-
-#ifndef TAO_BIDIR_POLICY_PIDL
-#define TAO_BIDIR_POLICY_PIDL
-
-#pragma prefix "omg.org"
-
-#include "tao/Policy.pidl"
-
-// Self contained module for Bi-directional GIOP policy
-module BiDirPolicy
-{
-  typedef unsigned short BidirectionalPolicyValue;
-  const BidirectionalPolicyValue NORMAL = 0;
-  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 ?
-  local interface BidirectionalPolicy : CORBA::Policy
-  {
-    readonly attribute BidirectionalPolicyValue value;
-  };
-};
-
-
-
-#pragma prefix ""
-
-#endif  /* TAO_BIDIR_POLICY_PIDL*/
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 4d39f3bedd6..2ae2b7bee33 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -73,6 +73,7 @@ PUB_HDRS = \
   FILE_Parser \
   CORBALOC_Parser \
   CORBANAME_Parser \
+  BiDir_Adapter \
   CORBA_String
 
 PLUGGABLE_PROTOCOLS_FILES = \
@@ -85,6 +86,7 @@ PLUGGABLE_PROTOCOLS_FILES = \
   Acceptor_Registry \
   Protocol_Factory \
   Acceptor_Filter \
+  BiDir_Adapter \
   iiop_endpoints \
   IIOP_Factory \
   IIOP_Lite_Factory \
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 7d0d4e6cd4c..216d3968f15 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1,8 +1,5 @@
-<<<<<<< ORB.cpp
 // $Id$
-=======
-// $Id$
->>>>>>> 1.376.2.1
+
 
 
 #include "ORB.h"
@@ -79,11 +76,6 @@ using std::set_unexpected;
 
 ACE_RCSID(tao, ORB, "$Id$")
 
-<<<<<<< ORB.cpp
-=======
-ACE_RCSID(tao, ORB, "$Id$")
->>>>>>> 1.376.2.1
-
 
 static const char ior_prefix [] = "IOR:";