ChangeLogTag:Sat Apr 14 17:01:05 2001 Carlos O'Ryan <coryan@uci.edu>

3 files changed, 44 insertions, 113 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 91e2acfcc23..9c8b1de0007 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Sat Apr 14 17:01:05 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tao/TAO.dsp:
+          Complete merge for Win32, CVS' automatic merge was not quite the
+          right thing for this file.
+
+        * tao/BiDir_Policy_i.cpp:
+          This file was removed in the main trunk but was accidentally
+          resurrected during the merge.
+
 Sat Apr 14 12:59:39 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * tao/Block_Flushing_Strategy.h:
diff --git a/TAO/tao/BiDir_Policy_i.cpp b/TAO/tao/BiDir_Policy_i.cpp
deleted file mode 100644
index 3a02dbd8a5c..00000000000
--- a/TAO/tao/BiDir_Policy_i.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-#include "tao/BiDir_Policy_i.h"
-#include "tao/Stub.h"
-
-ACE_RCSID(TAO, BiDir_Policy_i, "$Id$")
-
-
-
-#if ! defined (__ACE_INLINE__)
-#include "tao/BiDir_Policy_i.inl"
-#endif /* __ACE_INLINE__ */
-
-TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (
-    const BiDirPolicy::BidirectionalPolicyValue  val)
-  : value_ (val)
-{
-}
-
-TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs)
-  : BiDirPolicy::BidirectionalPolicy (),
-    TAO_Local_RefCounted_Object (),
-    value_ (rhs.value_)
-{
-}
-
-
-
-CORBA::PolicyType
-TAO_BidirectionalPolicy::policy_type (CORBA_Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Future policy implementors: notice how this minimizes the
-  // footprint of the class.
-  return BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE;
-}
-
-
-TAO_BidirectionalPolicy *
-TAO_BidirectionalPolicy::clone (void) const
-{
-  TAO_BidirectionalPolicy *copy = 0;
-  ACE_NEW_RETURN (copy,
-                  TAO_BidirectionalPolicy (*this),
-                  0);
-  return copy;
-}
-
-CORBA::Policy_ptr
-TAO_BidirectionalPolicy::copy (CORBA_Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Future policy implementors: notice how the following code is
-  // exception safe!
-
-  TAO_BidirectionalPolicy* tmp;
-  ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_BidirectionalPolicy::destroy (CORBA_Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-
-BiDirPolicy::BidirectionalPolicyValue
-TAO_BidirectionalPolicy::value (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException))
-{
-  return this->value_;
-}
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 699da0322b3..8ad25f21cc5 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -203,19 +203,7 @@ SOURCE=.\Base_Transport_Property.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\BiDir_ORBInitializer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\BiDir_Policy_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\BiDir_PolicyFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\BiDirPolicyC.cpp

+SOURCE=.\BiDir_Adapter.cpp

 # End Source File

 # Begin Source File

 

@@ -359,6 +347,10 @@ SOURCE=.\Endpoint.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Endpoint_Selector_Factory.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Environment.cpp

 # End Source File

 # Begin Source File

@@ -719,6 +711,10 @@ SOURCE=.\RT_Current.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Endpoint_Selector_Factory.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\RT_Invocation_Endpoint_Selectors.cpp

 # End Source File

 # Begin Source File

@@ -835,6 +831,10 @@ SOURCE=.\target_specification.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Thread_Pool.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\TimeBaseC.cpp

 # End Source File

 # Begin Source File

@@ -867,6 +867,10 @@ SOURCE=.\Typecode_Constants.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\TypeCodeFactory_Adapter.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\ValueBase.cpp

 # End Source File

 # Begin Source File

@@ -947,19 +951,7 @@ SOURCE=.\Base_Transport_Property.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\BiDir_ORBInitializer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BiDir_Policy_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BiDir_PolicyFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BiDirPolicyC.h

+SOURCE=.\BiDir_Adapter.h

 # End Source File

 # Begin Source File

 

@@ -1115,6 +1107,10 @@ SOURCE=.\Endpoint.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Endpoint_Selector_Factory.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Environment.h

 # End Source File

 # Begin Source File

@@ -1523,6 +1519,10 @@ SOURCE=.\RT_Current.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\RT_Endpoint_Selector_Factory.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\RT_Invocation_Endpoint_Selectors.h

 # End Source File

 # Begin Source File

@@ -1667,6 +1667,10 @@ SOURCE=.\target_specification.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Thread_Pool.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\TimeBaseC.h

 # End Source File

 # Begin Source File

@@ -1711,6 +1715,10 @@ SOURCE=.\typecode.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\TypeCodeFactory_Adapter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ValueBase.h

 # End Source File

 # Begin Source File

@@ -1779,14 +1787,6 @@ SOURCE=.\Base_Transport_Property.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\BiDir_Policy_i.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\BiDirPolicyC.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Bind_Dispatcher_Guard.i

 # End Source File

 # Begin Source File