1 files changed, 5 insertions, 36 deletions
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index bc44c92e5f9..8748d0f6147 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 //=============================================================================
 /**
  *  @file    operation_details.h
@@ -14,19 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/SystemException.h"
+#include "SystemException.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Service_Context.h"
-#include "tao/TimeBaseC.h"
-#include "tao/target_specification.h"
+#include "Service_Context.h"
+#include "target_specification.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations
 namespace Dynamic
 {
@@ -40,14 +37,6 @@ namespace TAO
   struct Exception_Data;
 }
 
-namespace TAO
-{
-  namespace CSD
-  {
-    class FW_Server_Request_Wrapper;
-  }
-}
-
 /**
  * @class TAO_Operation_Details
  *
@@ -64,11 +53,6 @@ class TAO_Export TAO_Operation_Details
 {
 public:
 
-  /// Declare FW_Server_Request_Wrapper a friend
-  /// This friendship makes the FW_Server_Request_Wrapper be able to
-  /// clone the TAO_Operation_Details data member in TAO_ServerRequest.
-  friend class TAO::CSD::FW_Server_Request_Wrapper;
-
   /// Constructor
   TAO_Operation_Details (const char *name,
                          CORBA::ULong len,
@@ -156,12 +140,6 @@ public:
 
   TAO::Exception_Data const * ex_data (void) const;
 
-  void ft_expiration_time (TimeBase::TimeT time);
-  TimeBase::TimeT ft_expiration_time (void) const;
-
-  void ft_retention_id (CORBA::Long request_id);
-  CORBA::Long ft_retention_id (void) const;
-
 private:
 
   /// Name of the operation being invoked.
@@ -203,19 +181,10 @@ private:
 
   /// Count of the exceptions that operations can throw.
   CORBA::ULong ex_count_;
-#if TAO_HAS_INTERCEPTORS == 1
-  /// FT request expiration time (absolute gregorian)
-  TimeBase::TimeT ft_expiration_time_;
-
-  /// FT request retention id
-  CORBA::Long ft_retention_id_;
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/operation_details.i"
+# include "operation_details.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"