Merge branch 'master' into message_queue_ex_get_queue

1 files changed, 4 insertions, 11 deletions

diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
index 7ee2acb36f4..8b05e5b8eca 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
@@ -12,35 +12,28 @@
 #define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/IdAssignmentStrategy.h"
-#include "ace/Service_Config.h"
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
   namespace Portable_Server
   {
-    class IdAssignmentStrategySystem
-      : public IdAssignmentStrategy
+    class IdAssignmentStrategySystem : public IdAssignmentStrategy
     {
     public:
-      virtual char id_assignment_key_type () const;
+      char id_assignment_key_type () const override;
 
-      virtual bool has_system_id () const;
+      bool has_system_id () const override;
     };
   }
 }
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem)
-ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem)
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"