1 files changed, 8 insertions, 85 deletions
diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp
index a0db16f7902..95230e368af 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorA.cpp
@@ -25,14 +25,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantActivatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ServantActivatorA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -45,88 +45,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/ServantActivator:2.3",
     "ServantActivator");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantActivator =
     &_tao_tc_PortableServer_ServantActivator;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr _tao_elem
-  )
-{
-  PortableServer::ServantActivator_ptr _tao_objptr =
-    PortableServer::ServantActivator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantActivator>::insert (
-      _tao_any,
-      PortableServer::ServantActivator::_tao_any_destructor,
-      PortableServer::_tc_ServantActivator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantActivator>::extract (
-        _tao_any,
-        PortableServer::ServantActivator::_tao_any_destructor,
-        PortableServer::_tc_ServantActivator,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */