1 files changed, 2 insertions, 157 deletions

diff --git a/TAO/tao/PortableInterceptor.h b/TAO/tao/PortableInterceptor.h
index 730a87119af..8a759378997 100644
--- a/TAO/tao/PortableInterceptor.h
+++ b/TAO/tao/PortableInterceptor.h
@@ -6,11 +6,7 @@
  *
  *  $Id$
  *
- *   This file contains two helper classes to simplify the support of
- *   interceptors in tao_idl generated code.  All the helper classes
- *   implementations are in PortableInterceptor.i file.
- *
- *   A series of TAO_INTERCEPTOR* macros are also defined in the file.
+ *   A series of TAO_INTERCEPTOR* macros are defined in this file.
  *   These macros allows us to disable/enable support of interceptors
  *   easily.
  *
@@ -26,7 +22,7 @@
 
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,157 +42,6 @@
 # define TAO_INTERCEPTOR_THROW_RETURN(X,Y) ACE_THROW_RETURN(X,Y)
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-#include "PortableInterceptorC.h"
-#include "Interceptor_List.h"
-
-// Forward declarations
-class TAO_ClientRequestInfo;
-
-/**
- * @class TAO_ClientRequestInterceptor_Adapter
- *
- * @brief TAO_ClientRequestInterceptor_Adapter
- *
- * A convenient helper class to invoke registered client request
- * interceptor(s) in tao_idl generated code.
- */
-class TAO_Export TAO_ClientRequestInterceptor_Adapter
-{
-
-public:
-
-  TAO_ClientRequestInterceptor_Adapter (
-    TAO_ClientRequestInterceptor_List::TYPE &interceptors);
-
-  ~TAO_ClientRequestInterceptor_Adapter (void);
-
-  /**
-   * @name PortableInterceptor Client Side Interception Points
-   *
-   * Each of these methods corresponds to a client side interception
-   * point.  There are no "intermediate" interception points on the
-   * client side, only "starting" and "ending" interception points.
-   *
-   * @todo
-   * The "send_poll()" and "receive_other()" (for AMI)
-   * PortableInterceptor interception points are missing.
-   */
-  //@{
-  /// This method implements one of the "starting" client side
-  /// interception points.
-  void send_request (TAO_ClientRequestInfo *ri,
-                     CORBA::Environment &);
-
-  /// This method implements one of the "ending" client side
-  /// interception point.
-  void receive_reply (TAO_ClientRequestInfo *ri,
-                      CORBA::Environment &);
-
-  /// This method implements one of the "ending" client side
-  /// interception point.
-  void receive_exception (TAO_ClientRequestInfo *ri,
-                          CORBA::Environment &);
-
-  /// This method implements one of the "ending" client side
-  /// interception point.
-  void receive_other (TAO_ClientRequestInfo *ri,
-                      CORBA::Environment &);
-  //@}
-
-private:
-
-  /// Reference to the list of registered interceptors.
-  TAO_ClientRequestInterceptor_List::TYPE &interceptors_;
-
-  /// Cache the length of the interceptor list so that we don't have
-  /// to compute it at each stage of the current interception.
-  size_t len_;
-
-  /// The number of interceptors "pushed" onto the logical flow
-  /// stack.  This is used when unwinding the flow stack.
-  size_t stack_size_;
-
-};
-
-/**
- * @class TAO_ServerRequestInterceptor_Adapter
- *
- * @brief TAO_ServerRequestInterceptor_Adapter
- *
- * A convenient helper class to invoke registered server request
- * interceptor(s) in tao_idl generated code.
- */
-class TAO_Export TAO_ServerRequestInterceptor_Adapter
-{
-
-public:
-
-  TAO_ServerRequestInterceptor_Adapter (
-    TAO_ServerRequestInterceptor_List::TYPE &interceptors,
-    size_t &stack_size);
-
-  ~TAO_ServerRequestInterceptor_Adapter (void);
-
-  /**
-   * @name PortableInterceptor Client Side Interception Points
-   *
-   * Each of these methods corresponds to a client side interception
-   * point.
-   *
-   * @todo
-   * The "receive_request_service_contexts()" and "send_other()"
-   * PortableInterceptor interception points are missing.
-   */
-  //@{
-  /// This method implements the "starting" server side interception
-  /// point.
-  void receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri,
-    CORBA::Environment &);
-
-  /// This method an "intermediate" server side interception point.
-  void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-                        CORBA::Environment &);
-
-  /// This method implements one of the "ending" server side
-  /// interception points.
-  void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri,
-                   CORBA::Environment &);
-
-  /// This method implements one of the "ending" server side
-  /// interception points.
-  void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri,
-                       CORBA::Environment &);
-
-  /// This method implements one of the "ending" server side
-  /// interception points.
-  void send_other (PortableInterceptor::ServerRequestInfo_ptr ri,
-                   CORBA::Environment &);
-  //@}
-
-private:
-
-  /// Reference to the list of registered interceptors.
-  TAO_ServerRequestInterceptor_List::TYPE &interceptors_;
-
-  /// Cache the length of the interceptor list so that we don't have
-  /// to compute it at each stage of the current interception.
-  size_t len_;
-
-  /// The number of interceptors "pushed" onto the logical flow
-  /// stack.  This is used when unwinding the flow stack.
-  size_t &stack_size_;
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "PortableInterceptor.i"
-#endif /* defined INLINE */
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #include "ace/post.h"
 
 #endif /* TAO_PORTABLE_INTERCEPTOR_H */