Merge pull request #2050 from jwillemsen/jwi-portableserverstrategysimplify

Major cleanup in PortableServer library

1 files changed, 2 insertions, 10 deletions

diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
index 1bf7c0cf336..af3db329d0c 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
@@ -13,15 +13,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/ThreadStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ThreadStrategy.h"
 #include "tao/orbconf.h"
-#include "ace/Service_Config.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -29,22 +27,16 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    class ThreadStrategyORBControl
-       : public ThreadStrategy
+    class ThreadStrategyORBControl : public ThreadStrategy
     {
     public:
       int enter () override;
 
       int exit () override;
-
-      ::PortableServer::ThreadPolicyValue type() const override;
     };
   }
 }
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl)
-ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl)
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"