1 files changed, 10 insertions, 55 deletions

diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index b38d013d159..6b597093e0f 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -25,7 +25,6 @@
 #if defined (TAO_HAS_CORBA_MESSAGING)
 
 #include "tao/POA_CORBA.h"
-#include "tao/MessagingS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -53,7 +52,7 @@ public:
     );
   // Modify the list of policies to include <policies>.
   // If <set_add> is CORBA::SET_OVERRIDE then we replace all the old
-  // policies. If it is CORBA::ADD_OVERRIDE we simply add the policies
+  // policies. If it is CORBA::ADD_OVERRIDE we simply add the policies 
   // in <policies>.
   // No attempt is made to validate the policies for consitency.
 
@@ -72,22 +71,12 @@ public:
     );
   // Obtain a single policy.
 
-  // = Direct accesors to the policy implementations, for speedy
-  //   lookups.
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      relative_roundtrip_timeout (void) const;
-
 private:
-  // The known policies are kept as pointers to the implementation
-  // objects, this allow us to query the supported policies really
-  // fast, without memory allocations.
-  POA_Messaging::RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout_;
-
-  CORBA::PolicyList other_policies_;
-  // Other policies that are not optimized for fast querying
+  CORBA::Policy_var policies_[TAO_MAX_POLICIES];
+  // The policies
 
   CORBA::ULong count_;
-  // The number of non-nil policies
+  // The number of non-nil policies...
 };
 
 // ****************************************************************
@@ -118,8 +107,6 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      relative_roundtrip_timeout (void) const;
 
 private:
   TAO_Policy_Manager_Impl impl_;
@@ -128,42 +115,12 @@ private:
 
 // ****************************************************************
 
-class TAO_Export TAO_Policy_Current_Impl
-{
-public:
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  // Obtain a single policy.
-
-  // = The CORBA::PolicyManager operations
-
-  CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      relative_roundtrip_timeout (void) const;
-
-private:
-  TAO_Policy_Manager_Impl manager_impl_;
-  // The implementation.
-};
-
-// ****************************************************************
-
 class TAO_Export TAO_Policy_Current : public POA_CORBA::PolicyCurrent
 {
 public:
+  TAO_Policy_Current (void);
+  // constructor
+ 
   CORBA::Policy_ptr get_policy (
       CORBA::PolicyType policy,
       CORBA::Environment &ACE_TRY_ENV =
@@ -184,12 +141,10 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      relative_roundtrip_timeout (void) const;
 
-  // = Set and get the implementation.
-  TAO_Policy_Current_Impl &implementation (void) const;
-  TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &);
+private:
+  TAO_Policy_Manager_Impl impl_;
+  // The implementation.
 };
 
 #if defined (__ACE_INLINE__)