Merge branch 'master' into message_queue_ex_get_queue

1 files changed, 1 insertions, 21 deletions

diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
index f564757c699..713b6a92e04 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -14,20 +14,6 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategy::RequestProcessingStrategy ()
-      : poa_ (0)
-    {
-    }
-
-    void
-    RequestProcessingStrategy::strategy_init(
-      TAO_Root_POA *poa,
-      ::PortableServer::ServantRetentionPolicyValue sr_value)
-    {
-      poa_ = poa;
-      sr_value_ = sr_value;
-    }
-
     void
     RequestProcessingStrategy::strategy_init(TAO_Root_POA *poa)
     {
@@ -37,13 +23,7 @@ namespace TAO
     void
     RequestProcessingStrategy::strategy_cleanup()
     {
-      poa_ = 0;
-    }
-
-    ::PortableServer::ServantRetentionPolicyValue
-    RequestProcessingStrategy::sr_type() const
-    {
-      return sr_value_;
+      poa_ = nullptr;
     }
   }
 }