ChangeLogTag: Mon Feb 21 18:13:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

97 files changed, 98 insertions, 400 deletions

diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 21b71729c83..b4ee793e3cf 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -474,7 +474,9 @@ TAO_Codeset_Manager::get_wchar_trans (CONV_FRAME::CodeSetId tcs)
         {
           if (TAO_debug_level > 9)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_LIB_TEXT("TAO (%P|%t) Using utf16 BOM translator\n")));
+                        ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                        ACE_TEXT ("get_wchar_trans, ")
+                        ACE_TEXT ("Using utf16 BOM translator\n")));
           if (this->utf16_bom_translator_ == 0)
             {
               this->utf16_bom_translator_ =
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index 3049bc644ee..28553a77693 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -60,7 +60,7 @@ namespace TAO
 
     void
     Active_Policy_Strategies::update (Cached_Policies &policies,
-                                      TAO_Root_POA* poa
+                                      ::TAO_Root_POA *poa
                                       ACE_ENV_ARG_DECL)
     {
       thread_strategy_factory_ =
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
index d857cf1b817..87cb019e4b5 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -10,10 +10,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdAssignmentStrategy::~IdAssignmentStrategy (void)
-    {
-    }
-
     void
     IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED)
     {
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h
index 345e6ba1790..4acdabe2128 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export IdAssignmentStrategy :
-       public virtual Policy_Strategy
+       public Policy_Strategy
     {
     public:
-      virtual ~IdAssignmentStrategy (void);
-
       virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
 
       virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
index 40ecb477f7b..73a5e0c050a 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
@@ -30,7 +30,7 @@ namespace TAO
     class IdAssignmentStrategy;
 
     class TAO_PortableServer_Export IdAssignmentStrategyFactory
-      : public virtual StrategyFactory
+      : public StrategyFactory
     {
     public:
       /// Create a new servant retention strategy
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
index e04f82bc312..0117cbd5f7f 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -12,10 +12,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdAssignmentStrategyFactoryImpl::~IdAssignmentStrategyFactoryImpl (void)
-    {
-    }
-
     IdAssignmentStrategy*
     IdAssignmentStrategyFactoryImpl::create (
       ::PortableServer::IdAssignmentPolicyValue value)
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
index 93232f4d186..2ae4e43b745 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export IdAssignmentStrategyFactoryImpl
-      : public virtual IdAssignmentStrategyFactory
+      : public IdAssignmentStrategyFactory
     {
     public:
-      virtual ~IdAssignmentStrategyFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual IdAssignmentStrategy* create (
         ::PortableServer::IdAssignmentPolicyValue value);
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
index 7ffc6c76380..5c064e75d7b 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -10,10 +10,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdAssignmentStrategySystem::~IdAssignmentStrategySystem()
-    {
-    }
-
     char
     IdAssignmentStrategySystem::id_assignment_key_type (void) const
     {
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
index d4d8558003e..9568bf96d61 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export IdAssignmentStrategySystem
-      : public virtual IdAssignmentStrategy
+      : public IdAssignmentStrategy
     {
     public:
-      virtual ~IdAssignmentStrategySystem (void);
-
       virtual char id_assignment_key_type (void) const;
 
       virtual bool has_system_id (void) const;
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
index 3cb95040b1b..a5124bb5dc7 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -10,10 +10,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdAssignmentStrategyUser::~IdAssignmentStrategyUser()
-    {
-    }
-
     char
     IdAssignmentStrategyUser::id_assignment_key_type (void) const
     {
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
index 57c716f2ccc..b4eee284501 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export IdAssignmentStrategyUser
-      : public virtual IdAssignmentStrategy
+      : public IdAssignmentStrategy
     {
     public:
-      virtual ~IdAssignmentStrategyUser (void);
-
       virtual char id_assignment_key_type (void) const;
 
       virtual bool has_system_id (void) const;
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.cpp b/TAO/tao/PortableServer/IdUniquenessStrategy.cpp
deleted file mode 100644
index e64ea29167f..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategy.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-#include "IdUniquenessStrategy.h"
-
-ACE_RCSID (PortableServer,
-           Id_Uniqueness_Strategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    IdUniquenessStrategy::~IdUniquenessStrategy()
-    {
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h
index f7cdedea0c0..bdb2f08e182 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategy.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h
@@ -28,14 +28,10 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    class ServantRetentionStrategy;
-
     class TAO_PortableServer_Export IdUniquenessStrategy
-      : public virtual Policy_Strategy
+      : public Policy_Strategy
     {
     public:
-      virtual ~IdUniquenessStrategy (void);
-
       /*
        * Validate if the servant may be activated
        * @retval true This servant may be activated
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
index b38186003f3..c4c28dd26e4 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
@@ -30,7 +30,7 @@ namespace TAO
     class IdUniquenessStrategy;
 
     class TAO_PortableServer_Export IdUniquenessStrategyFactory
-      : public virtual StrategyFactory
+      : public StrategyFactory
     {
     public:
       /// Create a new servant retention strategy
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
index ff1f25c84b3..6decb9a62b8 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -12,47 +12,37 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdUniquenessStrategyFactoryImpl::~IdUniquenessStrategyFactoryImpl (void)
-    {
-    }
     IdUniquenessStrategy*
     IdUniquenessStrategyFactoryImpl::create (
       ::PortableServer::IdUniquenessPolicyValue value)
     {
       IdUniquenessStrategy* strategy = 0;
+      const char * strategy_name = 0;
 
       switch (value)
       {
         case ::PortableServer::MULTIPLE_ID :
         {
-          strategy =
-            ACE_Dynamic_Service<IdUniquenessStrategy>::instance ("IdUniquenessStrategyMultiple");
-
-          if (strategy == 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("Unable to get ")
-                        ACE_TEXT ("IdUniquenessStrategyMultiple")));
-
+          strategy_name = "IdUniquenessStrategyMultiple";
           break;
         }
         case ::PortableServer::UNIQUE_ID :
         {
-          IdUniquenessStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyUniqueFactory");
-
-          if (strategy_factory != 0)
-            strategy = strategy_factory->create (value);
-          else
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("Unable to get ")
-                        ACE_TEXT ("IdUniquenessStrategyUniqueFactory")));
-
+          strategy_name = "IdUniquenessStrategyUniqueFactory";
           break;
         }
       }
 
+      IdUniquenessStrategyFactory *strategy_factory =
+        ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance (strategy_name);
+
+      if (strategy_factory != 0)
+        strategy = strategy_factory->create (value);
+      else
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) Unable to get %s\n"),
+                    strategy_name));
+
       return strategy;
     }
 
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
index 0201368036d..a6269f4d364 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export IdUniquenessStrategyFactoryImpl
-      : public virtual IdUniquenessStrategyFactory
+      : public IdUniquenessStrategyFactory
     {
     public:
-      virtual ~IdUniquenessStrategyFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual IdUniquenessStrategy* create (
         ::PortableServer::IdUniquenessPolicyValue value);
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index 1fb5080a86d..94db497d17b 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -10,10 +10,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdUniquenessStrategyMultiple::~IdUniquenessStrategyMultiple()
-    {
-    }
-
     void
     IdUniquenessStrategyMultiple::strategy_init (
       TAO_Root_POA * /*poa*/
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
index 5cb336938fc..e706f0e7b87 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export IdUniquenessStrategyMultiple
-      : public virtual IdUniquenessStrategy
+      : public IdUniquenessStrategy
     {
     public:
-      virtual ~IdUniquenessStrategyMultiple (void);
-
       virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
 
       virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index 64edae4df15..e87185a49a8 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -16,10 +16,6 @@ namespace TAO
     {
     }
 
-    IdUniquenessStrategyUnique::~IdUniquenessStrategyUnique()
-    {
-    }
-
     void
     IdUniquenessStrategyUnique::strategy_init (
       TAO_Root_POA *poa
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
index 3fdf7dba796..7af8890f475 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
@@ -28,13 +28,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export IdUniquenessStrategyUnique
-      : public virtual IdUniquenessStrategy
+      : public IdUniquenessStrategy
     {
     public:
       IdUniquenessStrategyUnique (void);
 
-      virtual ~IdUniquenessStrategyUnique (void);
-
       virtual void strategy_init (TAO_Root_POA *poa
                                   ACE_ENV_ARG_DECL);
 
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
index adf34ab10bd..4c55957752d 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -12,10 +12,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdUniquenessStrategyUniqueFactoryImpl::~IdUniquenessStrategyUniqueFactoryImpl (void)
-    {
-    }
-
     IdUniquenessStrategy*
     IdUniquenessStrategyUniqueFactoryImpl::create (
       ::PortableServer::IdUniquenessPolicyValue value)
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
index f1a20375cb9..927dda0a86b 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export IdUniquenessStrategyUniqueFactoryImpl
-      : public virtual IdUniquenessStrategyFactory
+      : public IdUniquenessStrategyFactory
     {
     public:
-      virtual ~IdUniquenessStrategyUniqueFactoryImpl (void);
-
       /// Create a new  strategy
       virtual IdUniquenessStrategy* create (
         ::PortableServer::IdUniquenessPolicyValue value);
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
index 5ff9d6f38ed..0e1e4d3002e 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -10,10 +10,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ImplicitActivationStrategy::~ImplicitActivationStrategy (void)
-    {
-    }
-
     void
     ImplicitActivationStrategy::strategy_init (
       TAO_Root_POA * /*poa*/
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
index 5e5a0205b4a..af0599aa4ed 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
@@ -27,11 +27,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ImplicitActivationStrategy
-      : public virtual Policy_Strategy
+      : public Policy_Strategy
     {
     public:
-      virtual ~ImplicitActivationStrategy (void);
-
       virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
 
       virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
index 37298a512d4..6ab4461093e 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -10,10 +10,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ImplicitActivationStrategyExplicit::~ImplicitActivationStrategyExplicit (void)
-    {
-    }
-
     bool
     ImplicitActivationStrategyExplicit::allow_implicit_activation (void) const
     {
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
index 4e2d82988eb..2f749eb662a 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ImplicitActivationStrategyExplicit :
-       public virtual ImplicitActivationStrategy
+       public ImplicitActivationStrategy
     {
     public:
-      virtual ~ImplicitActivationStrategyExplicit (void);
-
       virtual bool allow_implicit_activation (void) const;
     };
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
index a8456bcefdd..48ed323d19d 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
@@ -30,7 +30,7 @@ namespace TAO
     class ImplicitActivationStrategy;
 
     class TAO_PortableServer_Export ImplicitActivationStrategyFactory
-      : public virtual StrategyFactory
+      : public StrategyFactory
     {
     public:
       /// Create a new servant retention strategy
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 4d30e9fa6f9..fb0f9152892 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -13,43 +13,35 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ImplicitActivationStrategyFactoryImpl::~ImplicitActivationStrategyFactoryImpl (void)
-    {
-    }
     ImplicitActivationStrategy*
     ImplicitActivationStrategyFactoryImpl::create (
       ::PortableServer::ImplicitActivationPolicyValue value)
     {
       ImplicitActivationStrategy* strategy = 0;
+      const char * strategy_name = 0;
 
       switch (value)
       {
         case ::PortableServer::IMPLICIT_ACTIVATION :
         {
-          strategy =
-            ACE_Dynamic_Service<ImplicitActivationStrategy>::instance ("ImplicitActivationStrategyImplicit");
-
-          if (strategy == 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("Unable to get ")
-                        ACE_TEXT ("ImplicitActivationStrategyImplicit")));
+          strategy_name = "ImplicitActivationStrategyImplicit";
           break;
         }
         case ::PortableServer::NO_IMPLICIT_ACTIVATION :
         {
-          strategy =
-            ACE_Dynamic_Service<ImplicitActivationStrategy>::instance ("ImplicitActivationStrategyExplicit");
-
-          if (strategy == 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("Unable to get ")
-                        ACE_TEXT ("ImplicitActivationStrategyExplicit")));
+          strategy_name = "ImplicitActivationStrategyExplicit";
           break;
         }
       }
 
+      strategy =
+        ACE_Dynamic_Service<ImplicitActivationStrategy>::instance (strategy_name);
+
+      if (strategy == 0)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) Unable to get %s\n"),
+                    strategy_name));
+
       return strategy;
     }
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
index c877e5c0ae3..1f3d9ee895f 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ImplicitActivationStrategyFactoryImpl
-      : public virtual ImplicitActivationStrategyFactory
+      : public ImplicitActivationStrategyFactory
     {
     public:
-      virtual ~ImplicitActivationStrategyFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual ImplicitActivationStrategy* create (
         ::PortableServer::ImplicitActivationPolicyValue value);
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index b5289d63bd0..4128271a9a3 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -10,10 +10,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ImplicitActivationStrategyImplicit::~ImplicitActivationStrategyImplicit (void)
-    {
-    }
-
     bool
     ImplicitActivationStrategyImplicit::allow_implicit_activation (void) const
     {
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
index 0aa4733a537..766d0aff4cb 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
@@ -28,13 +28,10 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ImplicitActivationStrategyImplicit
-      : public virtual ImplicitActivationStrategy
+      : public ImplicitActivationStrategy
     {
     public:
-      virtual ~ImplicitActivationStrategyImplicit (void);
-
       virtual bool allow_implicit_activation (void) const;
-
     };
 
     ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit)
diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp
index 98411f899fd..42bec436226 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategy.cpp
@@ -24,10 +24,6 @@ namespace TAO
     {
     }
 
-    LifespanStrategy::~LifespanStrategy ()
-    {
-    }
-
     void
     LifespanStrategy::strategy_init (
       TAO_Root_POA *poa
diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h
index 49a94e67f17..ca22cc7ba54 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.h
+++ b/TAO/tao/PortableServer/LifespanStrategy.h
@@ -31,13 +31,11 @@ namespace TAO
     class Temporary_Creation_Time;
 
     class TAO_PortableServer_Export LifespanStrategy
-      : public virtual Policy_Strategy
+      : public Policy_Strategy
     {
     public:
       LifespanStrategy (void);
 
-      virtual ~LifespanStrategy (void);
-
       virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
 
       virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h
index eae79bc2c4b..ca53f9f58e0 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactory.h
+++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h
@@ -30,7 +30,7 @@ namespace TAO
     class LifespanStrategy;
 
     class TAO_PortableServer_Export LifespanStrategyFactory
-      : public virtual StrategyFactory
+      : public StrategyFactory
     {
     public:
       /// Create a new servant retention strategy
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index 985aa1a1ebd..72ea8c53559 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -12,48 +12,38 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    LifespanStrategyFactoryImpl::~LifespanStrategyFactoryImpl (void)
-    {
-    }
     LifespanStrategy*
     LifespanStrategyFactoryImpl::create (
       ::PortableServer::LifespanPolicyValue value)
     {
-      LifespanStrategy* strategy = 0;
+      LifespanStrategy *strategy = 0;
+      const char *strategy_name = 0;
 
       switch (value)
       {
         case ::PortableServer::PERSISTENT :
         {
-          LifespanStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyPersistentFactory");
-
-          if (strategy_factory != 0)
-            strategy = strategy_factory->create (value);
-          else
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("Unable to get ")
-                        ACE_TEXT ("LifespanStrategyPersistentFactory")));
-
+          strategy_name = "LifespanStrategyPersistentFactory";
           break;
         }
         case ::PortableServer::TRANSIENT :
         {
-          LifespanStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyTransientFactory");
-
-          if (strategy_factory != 0)
-            strategy = strategy_factory->create (value);
-          else
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("Unable to get ")
-                        ACE_TEXT ("LifespanStrategyTransientFactory")));
+          strategy_name = "LifespanStrategyTransientFactory";
           break;
         }
       }
 
+      LifespanStrategyFactory *strategy_factory =
+        ACE_Dynamic_Service<LifespanStrategyFactory>::instance (strategy_name);
+
+      if (strategy_factory != 0)
+        strategy = strategy_factory->create (value);
+      else
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) Unable to get %s\n"),
+                    strategy_name));
+
+
       return strategy;
     }
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
index 5df3c880f58..273a11a9d0f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export LifespanStrategyFactoryImpl
-      : public virtual LifespanStrategyFactory
+      : public LifespanStrategyFactory
     {
     public:
-      virtual ~LifespanStrategyFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual LifespanStrategy* create (
         ::PortableServer::LifespanPolicyValue value);
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 0fbb8ecf0bb..672828f2d24 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -110,10 +110,6 @@ namespace TAO
     {
     }
 
-    LifespanStrategyPersistent::~LifespanStrategyPersistent ()
-    {
-    }
-
     void
     LifespanStrategyPersistent::check_state (ACE_ENV_SINGLE_ARG_DECL)
     {
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
index 97cbb04f633..aa88e3b2ded 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
@@ -30,13 +30,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export LifespanStrategyPersistent
-      : public virtual LifespanStrategy
+      : public LifespanStrategy
     {
     public:
       LifespanStrategyPersistent ();
 
-      virtual ~LifespanStrategyPersistent (void);
-
       virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL);
 
       virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index 8ff42737deb..7d0e38c38d7 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -12,9 +12,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    LifespanStrategyPersistentFactoryImpl::~LifespanStrategyPersistentFactoryImpl (void)
-    {
-    }
     LifespanStrategy*
     LifespanStrategyPersistentFactoryImpl::create (
       ::PortableServer::LifespanPolicyValue value)
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
index e3f1bb384e1..a51984d8a51 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export LifespanStrategyPersistentFactoryImpl
-      : public virtual LifespanStrategyFactory
+      : public LifespanStrategyFactory
     {
     public:
-      virtual ~LifespanStrategyPersistentFactoryImpl (void);
-
       /// Create a new strategy
       virtual LifespanStrategy* create (
         ::PortableServer::LifespanPolicyValue value);
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
index 5b1034429c9..f442497bd3b 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -22,10 +22,6 @@ namespace TAO
     {
     }
 
-    LifespanStrategyTransient::~LifespanStrategyTransient ()
-    {
-    }
-
     void
     LifespanStrategyTransient::notify_startup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h
index 02addaf04b6..01f0bc4c02f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h
@@ -29,13 +29,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export LifespanStrategyTransient
-      : public virtual LifespanStrategy
+      : public LifespanStrategy
     {
     public:
       LifespanStrategyTransient (void);
 
-      virtual ~LifespanStrategyTransient (void);
-
       virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL);
 
       virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index fb54f07692c..830665f2c8a 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -12,9 +12,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    LifespanStrategyTransientFactoryImpl::~LifespanStrategyTransientFactoryImpl (void)
-    {
-    }
     LifespanStrategy*
     LifespanStrategyTransientFactoryImpl::create (
       ::PortableServer::LifespanPolicyValue value)
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
index 007107f398d..5cd7ad9483b 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export LifespanStrategyTransientFactoryImpl
-      : public virtual LifespanStrategyFactory
+      : public LifespanStrategyFactory
     {
     public:
-      virtual ~LifespanStrategyTransientFactoryImpl (void);
-
       /// Create a new strategy
       virtual LifespanStrategy* create (
         ::PortableServer::LifespanPolicyValue value);
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
index d16a0f01c12..cbf2eb0bba7 100644
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -12,7 +12,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    POA_Guard::POA_Guard (TAO_Root_POA &poa
+    POA_Guard::POA_Guard (::TAO_Root_POA &poa
                           ACE_ENV_ARG_DECL,
                           int check_for_destruction)
       : guard_ (poa.lock ())
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
index 57af2de665f..a7347130783 100644
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -39,7 +39,7 @@ namespace TAO
     class TAO_PortableServer_Export POA_Guard
     {
     public:
-      POA_Guard (TAO_Root_POA &poa
+      POA_Guard (::TAO_Root_POA &poa
                  ACE_ENV_ARG_DECL,
                  int check_for_destruction = 1);
 
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
index 2d8c81c0cdb..bb2431e3b43 100644
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -31,7 +31,7 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export Policy_Strategy
-      : public virtual ACE_Service_Object
+      : public ACE_Service_Object
     {
     public:
       virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL) = 0;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
index 6439e34779c..e0874c451eb 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -15,8 +15,6 @@ ACE_RCSID (PortableServer,
            RequestProcessingStrategy,
            "$Id$")
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 namespace TAO
 {
   namespace Portable_Server
@@ -26,10 +24,6 @@ namespace TAO
     {
     }
 
-    RequestProcessingStrategy::~RequestProcessingStrategy()
-    {
-    }
-
     void
     RequestProcessingStrategy::strategy_init(
       TAO_Root_POA *poa,
@@ -62,5 +56,3 @@ namespace TAO
   }
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
index bc9f0e53041..7e0e6df12c9 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -46,13 +46,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategy
-      : public virtual Policy_Strategy
+      : public Policy_Strategy
     {
     public:
       RequestProcessingStrategy (void);
 
-      virtual ~RequestProcessingStrategy (void);
-
       virtual void strategy_init(
         TAO_Root_POA *poa
         ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 396953587da..b77993ba572 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -19,10 +19,6 @@ namespace TAO
     {
     }
 
-    RequestProcessingStrategyAOMOnly::~RequestProcessingStrategyAOMOnly()
-    {
-    }
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     PortableServer::ServantManager_ptr
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index 704b1b8a3a5..22e1e48fab0 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -29,13 +29,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyAOMOnly
-      : public virtual RequestProcessingStrategy
+      : public RequestProcessingStrategy
     {
     public:
       RequestProcessingStrategyAOMOnly (void);
 
-      virtual ~RequestProcessingStrategyAOMOnly (void);
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
       PortableServer::ServantManager_ptr
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index 30fcabf47f8..97eb1c180df 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -13,10 +13,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyAOMOnlyFactoryImpl::~RequestProcessingStrategyAOMOnlyFactoryImpl (void)
-    {
-    }
-
     RequestProcessingStrategy*
     RequestProcessingStrategyAOMOnlyFactoryImpl::create (
       ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
index d4767c44272..81e10c20474 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyAOMOnlyFactoryImpl
-       : public virtual RequestProcessingStrategyFactory
+       : public RequestProcessingStrategyFactory
     {
     public:
-      virtual ~RequestProcessingStrategyAOMOnlyFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual RequestProcessingStrategy* create (
         ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 148dceb7a5b..af2c9b1cfb3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -24,10 +24,6 @@ namespace TAO
     {
     }
 
-    RequestProcessingStrategyDefaultServant::~RequestProcessingStrategyDefaultServant (void)
-    {
-    }
-
     void
     RequestProcessingStrategyDefaultServant::strategy_cleanup(
       ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
index eb58a60dfde..6683086c1f0 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -35,13 +35,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyDefaultServant
-      : public virtual RequestProcessingStrategy
+      : public RequestProcessingStrategy
     {
     public:
       RequestProcessingStrategyDefaultServant (void);
 
-      virtual ~RequestProcessingStrategyDefaultServant (void);
-
       virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
 
       PortableServer::ServantManager_ptr
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index 13fc765dbba..814f7fed058 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -15,10 +15,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyDefaultServantFactoryImpl::~RequestProcessingStrategyDefaultServantFactoryImpl (void)
-    {
-    }
-
     RequestProcessingStrategy*
     RequestProcessingStrategyDefaultServantFactoryImpl::create (
       ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
index ddc7ecdc3de..b02aba40dc3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
@@ -30,11 +30,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyDefaultServantFactoryImpl
-       : public virtual RequestProcessingStrategyFactory
+       : public RequestProcessingStrategyFactory
     {
     public:
-      virtual ~RequestProcessingStrategyDefaultServantFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual RequestProcessingStrategy* create (
         ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
index bd082ec8bf2..157321b4152 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
@@ -31,7 +31,7 @@ namespace TAO
     class RequestProcessingStrategy;
 
     class TAO_PortableServer_Export RequestProcessingStrategyFactory
-      : public virtual StrategyFactory
+      : public StrategyFactory
     {
     public:
       /// Create a new servant retention strategy
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index 45141e775fa..773e2eeff7a 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -15,10 +15,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyFactoryImpl::~RequestProcessingStrategyFactoryImpl (void)
-    {
-    }
-
     RequestProcessingStrategy*
     RequestProcessingStrategyFactoryImpl::create (
         ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
index af187c40b66..007659174cd 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
@@ -28,12 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyFactoryImpl
-      : public virtual RequestProcessingStrategyFactory
+      : public RequestProcessingStrategyFactory
     {
     public:
-      virtual ~RequestProcessingStrategyFactoryImpl (void);
-
-      /// Create a new request processing strategy
       virtual RequestProcessingStrategy* create (
         ::PortableServer::RequestProcessingPolicyValue value,
         ::PortableServer::ServantRetentionPolicyValue srvalue);
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index 42d4aba1f21..dfd86fde23a 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -23,10 +23,6 @@ namespace TAO
     {
     }
 
-    RequestProcessingStrategyServantActivator::~RequestProcessingStrategyServantActivator (void)
-    {
-    }
-
     void
     RequestProcessingStrategyServantActivator::strategy_cleanup (
       ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
index c5367708484..7bd2f7f77d3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -39,13 +39,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyServantActivator
-      : public virtual RequestProcessingStrategyServantManager
+      : public RequestProcessingStrategyServantManager
     {
     public:
       RequestProcessingStrategyServantActivator (void);
 
-      virtual ~RequestProcessingStrategyServantActivator (void);
-
       virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
 
       PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 6e703cb3208..76a624049eb 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -15,10 +15,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyServantActivatorFactoryImpl::~RequestProcessingStrategyServantActivatorFactoryImpl (void)
-    {
-    }
-
     RequestProcessingStrategy*
     RequestProcessingStrategyServantActivatorFactoryImpl::create (
       ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
index a26c022ba29..cdc19cff125 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
@@ -30,11 +30,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyServantActivatorFactoryImpl
-       : public virtual RequestProcessingStrategyFactory
+       : public RequestProcessingStrategyFactory
     {
     public:
-      virtual ~RequestProcessingStrategyServantActivatorFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual RequestProcessingStrategy* create (
         ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index 8fa14b1cdd4..2cb9ec8eb68 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -23,10 +23,6 @@ namespace TAO
     {
     }
 
-    RequestProcessingStrategyServantLocator::~RequestProcessingStrategyServantLocator (void)
-    {
-    }
-
     void
     RequestProcessingStrategyServantLocator::strategy_cleanup(
       ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
index 6c9fd9c7439..9084b7758bd 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -39,13 +39,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyServantLocator
-      : public virtual RequestProcessingStrategyServantManager
+      : public RequestProcessingStrategyServantManager
     {
     public:
       RequestProcessingStrategyServantLocator (void);
 
-      virtual ~RequestProcessingStrategyServantLocator (void);
-
       virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
 
       PortableServer::ServantManager_ptr get_servant_manager (
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index f332188279b..bbf43ec6326 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -15,10 +15,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyServantLocatorFactoryImpl::~RequestProcessingStrategyServantLocatorFactoryImpl (void)
-    {
-    }
-
     RequestProcessingStrategy*
     RequestProcessingStrategyServantLocatorFactoryImpl::create (
       ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
index 4333e880042..795a7b9d5b6 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
@@ -30,11 +30,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyServantLocatorFactoryImpl
-       : public virtual RequestProcessingStrategyFactory
+       : public RequestProcessingStrategyFactory
     {
     public:
-      virtual ~RequestProcessingStrategyServantLocatorFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual RequestProcessingStrategy* create (
         ::PortableServer::RequestProcessingPolicyValue value,
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index c73b1e4bd39..af78da4ca83 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -19,10 +19,6 @@ namespace TAO
     {
     }
 
-    RequestProcessingStrategyServantManager::~RequestProcessingStrategyServantManager (void)
-    {
-    }
-
     PortableServer::Servant
     RequestProcessingStrategyServantManager::get_servant (
       ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
index a00a20b1b08..fa7b01bd416 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -31,13 +31,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export RequestProcessingStrategyServantManager
-      : public virtual RequestProcessingStrategy
+      : public RequestProcessingStrategy
     {
     public:
       RequestProcessingStrategyServantManager (void);
 
-      virtual ~RequestProcessingStrategyServantManager (void);
-
       PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.cpp b/TAO/tao/PortableServer/ServantRetentionStrategy.cpp
deleted file mode 100644
index aba4cdd3ebb..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ServantRetentionStrategy.cpp
- *
- *  $Id$
- *
- */
-//=============================================================================
-
-#include "ServantRetentionStrategy.h"
-
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ServantRetentionStrategy::~ServantRetentionStrategy (void)
-    {
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index c8afcc89cd4..e710ff25f97 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -35,11 +35,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ServantRetentionStrategy
-      : public virtual Policy_Strategy
+      : public Policy_Strategy
     {
     public:
-      virtual ~ServantRetentionStrategy (void);
-
       virtual CORBA::ULong waiting_servant_deactivation (void) const = 0;
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
index ee5a233af0a..d2331dbd421 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
@@ -30,7 +30,7 @@ namespace TAO
     class ServantRetentionStrategy;
 
     class TAO_PortableServer_Export ServantRetentionStrategyFactory
-       : public virtual StrategyFactory
+       : public StrategyFactory
     {
     public:
       /// Create a new servant retention strategy
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index 5e0b751c0f8..af759e8a36d 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -12,10 +12,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ServantRetentionStrategyFactoryImpl::~ServantRetentionStrategyFactoryImpl (void)
-    {
-    }
-
     ServantRetentionStrategy*
     ServantRetentionStrategyFactoryImpl::create (
       ::PortableServer::ServantRetentionPolicyValue value)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
index 20207fc8565..637569c1c87 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ServantRetentionStrategyFactoryImpl
-       : public virtual ServantRetentionStrategyFactory
+       : public ServantRetentionStrategyFactory
     {
     public:
-      virtual ~ServantRetentionStrategyFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual ServantRetentionStrategy* create (
         ::PortableServer::ServantRetentionPolicyValue value);
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index 074a5f27361..2ac19f55e9c 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -30,10 +30,6 @@ namespace TAO
     {
     }
 
-    ServantRetentionStrategyNonRetain::~ServantRetentionStrategyNonRetain (void)
-    {
-    }
-
     void
     ServantRetentionStrategyNonRetain::strategy_init (
       TAO_Root_POA *poa
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index 392e348d5c4..e161732e088 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -30,13 +30,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ServantRetentionStrategyNonRetain
-       : public virtual ServantRetentionStrategy
+       : public ServantRetentionStrategy
     {
     public:
       ServantRetentionStrategyNonRetain (void);
 
-      virtual ~ServantRetentionStrategyNonRetain (void);
-
       virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
 
       virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index d0e45565063..16157731dc9 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -15,10 +15,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ServantRetentionStrategyNonRetainFactoryImpl::~ServantRetentionStrategyNonRetainFactoryImpl (void)
-    {
-    }
-
     ServantRetentionStrategy*
     ServantRetentionStrategyNonRetainFactoryImpl::create (
       ::PortableServer::ServantRetentionPolicyValue value)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
index fdee98fb3e7..04594be87f6 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
@@ -30,11 +30,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ServantRetentionStrategyNonRetainFactoryImpl
-       : public virtual ServantRetentionStrategyFactory
+       : public ServantRetentionStrategyFactory
     {
     public:
-      virtual ~ServantRetentionStrategyNonRetainFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual ServantRetentionStrategy* create (
         ::PortableServer::ServantRetentionPolicyValue value);
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index 1299b102e3b..d943c565254 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -34,10 +34,6 @@ namespace TAO
     {
     }
 
-    ServantRetentionStrategyRetain::~ServantRetentionStrategyRetain ()
-    {
-    }
-
     void
     ServantRetentionStrategyRetain::strategy_init (
       TAO_Root_POA *poa
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index 15a9f425752..a40689512b3 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -29,13 +29,11 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ServantRetentionStrategyRetain
-       : public virtual ServantRetentionStrategyNonRetain
+       : public ServantRetentionStrategyNonRetain
     {
     public:
       ServantRetentionStrategyRetain (void);
 
-      virtual ~ServantRetentionStrategyRetain (void);
-
       CORBA::ULong waiting_servant_deactivation (void) const;
 
       virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index 496ce4b519a..2fd3963fed2 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -13,10 +13,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ServantRetentionStrategyRetainFactoryImpl::~ServantRetentionStrategyRetainFactoryImpl (void)
-    {
-    }
-
     ServantRetentionStrategy*
     ServantRetentionStrategyRetainFactoryImpl::create (
       ::PortableServer::ServantRetentionPolicyValue value)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
index e1bbb881f55..9fd7a80ee08 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ServantRetentionStrategyRetainFactoryImpl
-       : public virtual ServantRetentionStrategyFactory
+       : public ServantRetentionStrategyFactory
     {
     public:
-      virtual ~ServantRetentionStrategyRetainFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual ServantRetentionStrategy* create (
         ::PortableServer::ServantRetentionPolicyValue value);
diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h
index 26fb66183bd..25627b8a603 100644
--- a/TAO/tao/PortableServer/StrategyFactory.h
+++ b/TAO/tao/PortableServer/StrategyFactory.h
@@ -26,7 +26,7 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export StrategyFactory :
-      public virtual ACE_Service_Object
+      public ACE_Service_Object
     {
     public:
       virtual ~StrategyFactory (void);
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index e054478a936..a314bcb436d 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -60,7 +60,6 @@ namespace TAO
     {
       return TAO_POLICY_POA_SCOPE;
     }
-
   }
 }
 
diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
index 37507e617c6..ad5fca97a19 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -12,10 +12,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ThreadStrategy::~ThreadStrategy()
-    {
-    }
-
     void
     ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED)
     {
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
index d8107641188..bb46642f7f8 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.h
+++ b/TAO/tao/PortableServer/ThreadStrategy.h
@@ -30,11 +30,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ThreadStrategy :
-       public virtual Policy_Strategy
+       public Policy_Strategy
     {
     public:
-      virtual ~ThreadStrategy (void);
-
       virtual int enter () = 0;
 
       virtual int exit () = 0;
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h
index 14954e94429..120ca7e115a 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactory.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h
@@ -30,7 +30,7 @@ namespace TAO
     class ThreadStrategy;
 
     class TAO_PortableServer_Export ThreadStrategyFactory
-       : public virtual StrategyFactory
+       : public StrategyFactory
     {
     public:
       /// Create a new servant retention strategy
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index 4d2dd1d8519..e1feeef133d 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -12,10 +12,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ThreadStrategyFactoryImpl::~ThreadStrategyFactoryImpl (void)
-    {
-    }
-
     ThreadStrategy*
     ThreadStrategyFactoryImpl::create (
       ::PortableServer::ThreadPolicyValue value)
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
index c035aa24987..9ffb364e529 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
@@ -28,11 +28,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ThreadStrategyFactoryImpl
-       : public virtual ThreadStrategyFactory
+       : public ThreadStrategyFactory
     {
     public:
-      virtual ~ThreadStrategyFactoryImpl (void);
-
       /// Create a new servant retention strategy
       virtual ThreadStrategy* create (
         ::PortableServer::ThreadPolicyValue value);
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
index ee82855edf1..5fda7c41c14 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -12,10 +12,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ThreadStrategyORBControl::~ThreadStrategyORBControl()
-    {
-    }
-
     int
     ThreadStrategyORBControl::enter ()
     {
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
index b5761aed682..7197bc8a242 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
@@ -29,11 +29,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ThreadStrategyORBControl
-       : public virtual ThreadStrategy
+       : public ThreadStrategy
     {
     public:
-      virtual ~ThreadStrategyORBControl (void);
-
       virtual int enter ();
 
       virtual int exit ();
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
index 6798ef8cf07..a2e5523d0e2 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -13,10 +13,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ThreadStrategySingle::~ThreadStrategySingle()
-    {
-    }
-
     int
     ThreadStrategySingle::enter ()
     {
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h
index 579f09db2be..b10a56f0bb4 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.h
@@ -38,11 +38,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ThreadStrategySingle :
-       public virtual ThreadStrategy
+       public ThreadStrategy
     {
     public:
-      virtual ~ThreadStrategySingle (void);
-
       virtual int enter ();
 
       virtual int exit ();
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index 9043697e93f..3e8bb695dc0 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -15,10 +15,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ThreadStrategySingleFactoryImpl::~ThreadStrategySingleFactoryImpl (void)
-    {
-    }
-
     ThreadStrategy*
     ThreadStrategySingleFactoryImpl::create (
       ::PortableServer::ThreadPolicyValue value)
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
index 6cc6642391c..050ed5a6c71 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
@@ -30,11 +30,9 @@ namespace TAO
   namespace Portable_Server
   {
     class TAO_PortableServer_Export ThreadStrategySingleFactoryImpl
-       : public virtual ThreadStrategyFactory
+       : public ThreadStrategyFactory
     {
     public:
-      virtual ~ThreadStrategySingleFactoryImpl (void);
-
       /// Create a new thread strategy
       virtual ThreadStrategy* create (
         ::PortableServer::ThreadPolicyValue value);
diff --git a/TAO/tao/UTF16_BOM_Translator.cpp b/TAO/tao/UTF16_BOM_Translator.cpp
index 716bbde3f2a..69cd26bf188 100644
--- a/TAO/tao/UTF16_BOM_Translator.cpp
+++ b/TAO/tao/UTF16_BOM_Translator.cpp
@@ -37,7 +37,9 @@ UTF16_BOM_Translator::UTF16_BOM_Translator (bool forceBE)
   : forceBE_(forceBE)
 {
   if (TAO_debug_level > 1)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT ("(%P|%t)UTF16_BOM_Translator:forceBE %d\n"), this->forceBE_?1:0 ));
+    ACE_DEBUG((LM_DEBUG,
+               ACE_TEXT ("TAO (%P|%t) - UTF16_BOM_Translator:forceBE %d\n"),
+               this->forceBE_?1:0 ));
 }
 
 UTF16_BOM_Translator::~UTF16_BOM_Translator (void)