1 files changed, 5 insertions, 88 deletions

diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 0677994dc3e..658f11d6238 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PI/ORBInitInfo.h"
+#include "ORBInitInfo.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
@@ -11,7 +11,7 @@
 #include "ace/Service_Config.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/PI/PICurrent.h"
+#include "PICurrent.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 ACE_RCSID (TAO,
@@ -19,13 +19,11 @@ ACE_RCSID (TAO,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "tao/PI/ORBInitInfo.inl"
+#include "ORBInitInfo.inl"
 #endif /* defined INLINE */
 
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Traits specializations for TAO_ORBInitInfo.
 
 TAO_ORBInitInfo_ptr
@@ -140,11 +138,11 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
 
       if (loader != 0)
         {
-          CORBA::Object_var cf =
+          CORBA::Object_ptr cf =
             loader->create_object (this->orb_core_->orb (), 0, 0 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (IOP::CodecFactory::_nil ());
 
-          this->codec_factory_ = IOP::CodecFactory::_narrow (cf.in ());
+          this->codec_factory_ = IOP::CodecFactory::_narrow (cf);
         }
     }
 
@@ -260,86 +258,6 @@ TAO_ORBInitInfo::add_ior_interceptor (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
-void
-TAO_ORBInitInfo::add_client_request_interceptor_with_policy (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName,
-                   CORBA::PolicyError))
-{
-# if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_core_->add_interceptor (interceptor,
-                                    policies
-                                    ACE_ENV_ARG_PARAMETER);
-#else
-  ACE_UNUSED_ARG (interceptor);
-  ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-}
-
-void
-TAO_ORBInitInfo::add_server_request_interceptor_with_policy (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName,
-                   CORBA::PolicyError))
-{
-# if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_core_->add_interceptor (interceptor,
-                                    policies
-                                    ACE_ENV_ARG_PARAMETER);
-
-#else
-  ACE_UNUSED_ARG (interceptor);
-  ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-}
-
-void
-TAO_ORBInitInfo::add_ior_interceptor_with_policy (
-    PortableInterceptor::IORInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName,
-                   CORBA::PolicyError))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Since there are currently no PI Policies that pertain to
-  // IOR Interceptors, we will always raise the NO_IMPLEMENT
-  // CORBA System Exception here to indicate that this method
-  // is currently not implemented/supported.
-  ACE_UNUSED_ARG (interceptor);
-  ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-}
-
 PortableInterceptor::SlotId
 TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -465,4 +383,3 @@ const char* TAO_ORBInitInfo::_interface_repository_id (void) const
   return "IDL:TAO_ORBInitInfo:1.0";
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL