1 files changed, 57 insertions, 52 deletions

diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 74c5986b947..d0d26a5bb8d 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -16,86 +16,91 @@
 #define TAO_POA_CACHED_POLICIES_H
 #include /**/ "ace/pre.h"
 
-#include "POA_Policies.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
+#include "ThreadPolicyC.h"
+#include "LifespanPolicyC.h"
+#include "IdUniquenessPolicyC.h"
+#include "IdAssignmentPolicyC.h"
+#include "ImplicitActivationPolicyC.h"
+#include "ServantRetentionPolicyC.h"
+#include "RequestProcessingPolicyC.h"
 
 // Forward references.
 class TAO_POA_Policy_Set;
 
-class TAO_PortableServer_Export TAO_POA_Cached_Policies
+namespace TAO
 {
-public:
-
-  enum PriorityModel
+  namespace Portable_Server
   {
-    CLIENT_PROPAGATED,
-    SERVER_DECLARED,
-    NOT_SPECIFIED
-  };
+    class TAO_PortableServer_Export Cached_Policies
+    {
+    public:
 
-  TAO_POA_Cached_Policies ();
+      enum PriorityModel
+      {
+        CLIENT_PROPAGATED,
+        SERVER_DECLARED,
+        NOT_SPECIFIED
+      };
 
-  ~TAO_POA_Cached_Policies (void);
+      Cached_Policies ();
 
-  /// Update the cached policy values.
-  void update (TAO_POA_Policy_Set &policy_set
-               ACE_ENV_ARG_DECL);
+      ~Cached_Policies (void);
 
-  /// Accessor methods to cached values.
-  PortableServer::ThreadPolicyValue thread (void) const;
-  PortableServer::LifespanPolicyValue lifespan (void) const;
-  PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
-  PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
-  PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
-  PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
-  PortableServer::RequestProcessingPolicyValue request_processing (void) const;
-  PriorityModel priority_model (void) const;
-  CORBA::Short server_priority (void) const;
+      /// Update the cached policy values.
+      void update (TAO_POA_Policy_Set &policy_set
+                   ACE_ENV_ARG_DECL);
 
-  void priority_model (PriorityModel priority_model);
-  void server_priority (CORBA::Short priority);
-  void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
+      /**
+       * @name Accessor methods to cached values.
+       */
+      //@{
+      PortableServer::ThreadPolicyValue thread (void) const;
+      PortableServer::LifespanPolicyValue lifespan (void) const;
+      PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
+      PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
+      PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
+      PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
+      PortableServer::RequestProcessingPolicyValue request_processing (void) const;
+      PriorityModel priority_model (void) const;
+      CORBA::Short server_priority (void) const;
 
-protected:
+      void priority_model (PriorityModel priority_model);
+      void server_priority (CORBA::Short priority);
+      void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
+      //@}
 
-  /// Helper method to update a particular policy.
-  void update_policy (const CORBA::Policy_ptr policy
-                      ACE_ENV_ARG_DECL);
+    protected:
 
-  PortableServer::ThreadPolicyValue thread_;
+      /// Helper method to update a particular policy.
+      void update_policy (const CORBA::Policy_ptr policy
+                          ACE_ENV_ARG_DECL);
 
-  PortableServer::LifespanPolicyValue lifespan_;
+      PortableServer::ThreadPolicyValue thread_;
 
-  PortableServer::IdUniquenessPolicyValue id_uniqueness_;
+      PortableServer::LifespanPolicyValue lifespan_;
 
-  PortableServer::IdAssignmentPolicyValue id_assignment_;
+      PortableServer::IdUniquenessPolicyValue id_uniqueness_;
 
-  PortableServer::ImplicitActivationPolicyValue implicit_activation_;
+      PortableServer::IdAssignmentPolicyValue id_assignment_;
 
-  PortableServer::ServantRetentionPolicyValue servant_retention_;
+      PortableServer::ImplicitActivationPolicyValue implicit_activation_;
 
-  PortableServer::RequestProcessingPolicyValue request_processing_;
+      PortableServer::ServantRetentionPolicyValue servant_retention_;
 
-  PriorityModel priority_model_;
+      PortableServer::RequestProcessingPolicyValue request_processing_;
 
-  CORBA::Short server_priority_;
-};
+      PriorityModel priority_model_;
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+      CORBA::Short server_priority_;
+    };
+  }
+}
 
 #if defined (__ACE_INLINE__)
 # include "POA_Cached_Policies.i"