diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-26 07:45:11 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-26 07:45:11 +0000 |
commit | 8e3452999df07e8131760cc86e6a3eb5d46866b6 (patch) | |
tree | 56c3bb0ab03b1c6c5edcf6dd310b779b03847e9d /TAO/tao/PortableServer | |
parent | 75c3761bdb0cae01f7861f293e83f8caa260fbec (diff) | |
download | ATCD-8e3452999df07e8131760cc86e6a3eb5d46866b6.tar.gz |
ChangeLogTag: Tue Jul 26 07:32:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer')
48 files changed, 68 insertions, 282 deletions
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index 4acdabe2128..e3085c33be2 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -14,20 +14,19 @@ #define TAO_ID_ASSIGNMENT_STRATEGY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Policy_Strategy.h" #include "tao/Basic_Types.h" namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export IdAssignmentStrategy : + class IdAssignmentStrategy : public Policy_Strategy { public: diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index ddbbf2e40b6..b83c49ecf00 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -61,16 +61,6 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<IdAssignmentStrategyFactoryImpl>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategyFactoryImpl> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategyFactoryImpl) } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index 5c064e75d7b..fbdbaed75c4 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -22,7 +22,7 @@ namespace TAO return true; } - ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategySystem) + ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategySystem) ACE_STATIC_SVC_DEFINE ( IdAssignmentStrategySystem, @@ -32,12 +32,6 @@ namespace TAO ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0 ) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<IdAssignmentStrategySystem>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategySystem> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index 9568bf96d61..6471e5bce3f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -27,7 +27,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export IdAssignmentStrategySystem + class IdAssignmentStrategySystem : public IdAssignmentStrategy { public: diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index a5124bb5dc7..9895db85f2e 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -22,7 +22,7 @@ namespace TAO return false; } - ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategyUser) + ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategyUser) ACE_STATIC_SVC_DEFINE ( IdAssignmentStrategyUser, @@ -32,12 +32,6 @@ namespace TAO ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0 ) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<IdAssignmentStrategyUser>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategyUser> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index b4eee284501..f202c12c6ad 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -27,7 +27,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export IdAssignmentStrategyUser + class IdAssignmentStrategyUser : public IdAssignmentStrategy { public: diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 039c9aef279..7a9aae6ed11 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -88,12 +88,6 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<IdUniquenessStrategyFactoryImpl>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyFactoryImpl> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyFactoryImpl) } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h index a6269f4d364..88d453a4a59 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h @@ -40,7 +40,7 @@ namespace TAO ACE_ENV_ARG_DECL); }; - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyFactoryImpl) + ACE_STATIC_SVC_DECLARE (IdUniquenessStrategyFactoryImpl) ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl) } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index 94db497d17b..19b94296166 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -45,7 +45,7 @@ namespace TAO return ::PortableServer::MULTIPLE_ID; } - ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyMultiple) + ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyMultiple) ACE_STATIC_SVC_DEFINE ( IdUniquenessStrategyMultiple, @@ -55,11 +55,5 @@ namespace TAO ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0 ) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<IdUniquenessStrategyMultiple>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyMultiple> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index e87185a49a8..b612a8ffb4d 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -57,7 +57,7 @@ namespace TAO return ::PortableServer::UNIQUE_ID; } - ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyUnique) + ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyUnique) ACE_STATIC_SVC_DEFINE ( IdUniquenessStrategyUnique, @@ -67,11 +67,5 @@ namespace TAO ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0 ) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<IdUniquenessStrategyUnique>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyUnique> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index 4c55957752d..77b597e30c9 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -55,17 +55,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<IdUniquenessStrategyUniqueFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyUniqueFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyUniqueFactoryImpl) } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index af0599aa4ed..fbdaf2cab52 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -14,19 +14,17 @@ #define TAO_ACTIVATION_STRATEGY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Policy_Strategy.h" - namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ImplicitActivationStrategy + class ImplicitActivationStrategy : public Policy_Strategy { public: diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 6ab4461093e..55f3a61fcef 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -16,7 +16,7 @@ namespace TAO return false; } - ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyExplicit) + ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyExplicit) ACE_STATIC_SVC_DEFINE ( ImplicitActivationStrategyExplicit, @@ -26,12 +26,6 @@ namespace TAO ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0 ) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<ImplicitActivationStrategyExplicit>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyExplicit> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index 2f749eb662a..0e03d29c584 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -27,7 +27,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ImplicitActivationStrategyExplicit : + class ImplicitActivationStrategyExplicit : public ImplicitActivationStrategy { public: diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index b62a89daff5..ef3916e288a 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -53,6 +53,8 @@ namespace TAO // Noop because both types are singletons } + ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyFactoryImpl) + ACE_STATIC_SVC_DEFINE ( ImplicitActivationStrategyFactoryImpl, ACE_TEXT ("ImplicitActivationStrategyFactory"), @@ -61,14 +63,6 @@ namespace TAO ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0 ) - - ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<ImplicitActivationStrategyFactoryImpl>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyFactoryImpl> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h index 1f3d9ee895f..90ff9ea0a63 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h @@ -27,7 +27,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ImplicitActivationStrategyFactoryImpl + class ImplicitActivationStrategyFactoryImpl : public ImplicitActivationStrategyFactory { public: diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 4128271a9a3..dbc91745bf1 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -16,7 +16,7 @@ namespace TAO return true; } - ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyImplicit) + ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyImplicit) ACE_STATIC_SVC_DEFINE ( ImplicitActivationStrategyImplicit, @@ -26,12 +26,6 @@ namespace TAO ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0 ) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<ImplicitActivationStrategyImplicit>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyImplicit> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index ca22cc7ba54..047427364ca 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -14,13 +14,12 @@ #define TAO_PORTABLESERVER_LIFESPANPOLICY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Policy_Strategy.h" #include "LifespanPolicyC.h" #include "tao/Object_KeyC.h" @@ -30,7 +29,7 @@ namespace TAO { class Temporary_Creation_Time; - class TAO_PortableServer_Export LifespanStrategy + class LifespanStrategy : public Policy_Strategy { public: diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index 4b3166af831..8f2fe097b6e 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -90,17 +90,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<LifespanStrategyFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<LifespanStrategyFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyFactoryImpl) } } diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index aa88e3b2ded..ac064a22463 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -14,13 +14,12 @@ #define TAO_LIFESPANSTRATEGYPERSISTENT_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "LifespanStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "LifespanStrategy.h" #include "tao/Object_KeyC.h" class ServerObject_i; @@ -29,7 +28,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export LifespanStrategyPersistent + class LifespanStrategyPersistent : public LifespanStrategy { public: diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index 7d0e38c38d7..1396342b549 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -55,17 +55,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<LifespanStrategyPersistentFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<LifespanStrategyPersistentFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyPersistentFactoryImpl) } } diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index 01f0bc4c02f..2b89e8b6c91 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -14,13 +14,12 @@ #define TAO_LIFESPANSTRATEGYTRANSIENT_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "LifespanStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "LifespanStrategy.h" #include "Creation_Time.h" #include "tao/Object_KeyC.h" @@ -28,7 +27,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export LifespanStrategyTransient + class LifespanStrategyTransient : public LifespanStrategy { public: diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index 830665f2c8a..c9a01858ca7 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -55,17 +55,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<LifespanStrategyTransientFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<LifespanStrategyTransientFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyTransientFactoryImpl) } } diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index bb2431e3b43..9498924469a 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -14,13 +14,12 @@ #define TAO_POLICY_STRATEGY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Object.h" #include "ace/CORBA_macros.h" #include "tao/Environment.h" @@ -30,7 +29,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export Policy_Strategy + class Policy_Strategy : public ACE_Service_Object { public: diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 7e0e6df12c9..c6029211f5f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -14,13 +14,12 @@ #define TAO_REQUEST_PROCESSING_STRATEGY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Policy_Strategy.h" #include "PortableServer.h" #include "Servant_Location.h" @@ -45,7 +44,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export RequestProcessingStrategy + class RequestProcessingStrategy : public Policy_Strategy { public: diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index 22e1e48fab0..f98b135f3ac 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -14,13 +14,12 @@ #define TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RequestProcessingStrategy.h" #include "Servant_Location.h" #include "PortableServer.h" @@ -28,7 +27,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export RequestProcessingStrategyAOMOnly + class RequestProcessingStrategyAOMOnly : public RequestProcessingStrategy { public: diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index 97eb1c180df..53a356fbf32 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -57,17 +57,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<RequestProcessingStrategyAOMOnlyFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyAOMOnlyFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyAOMOnlyFactoryImpl) } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 6683086c1f0..dcb5232e54e 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -14,13 +14,12 @@ #define TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RequestProcessingStrategy.h" #include "Servant_Base.h" #include "Servant_Location.h" @@ -34,7 +33,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export RequestProcessingStrategyDefaultServant + class RequestProcessingStrategyDefaultServant : public RequestProcessingStrategy { public: diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index 814f7fed058..ea8c1b03a3d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -59,17 +59,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<RequestProcessingStrategyDefaultServantFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyDefaultServantFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyDefaultServantFactoryImpl) } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index 1b3ec697074..8582dd19f01 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -138,13 +138,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<RequestProcessingStrategyFactoryImpl>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyFactoryImpl> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyFactoryImpl) } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 7bd2f7f77d3..8130b9eb8c0 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -14,13 +14,12 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "RequestProcessingStrategyServantManager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RequestProcessingStrategyServantManager.h" #include "Servant_Location.h" #include "PortableServer.h" @@ -38,7 +37,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export RequestProcessingStrategyServantActivator + class RequestProcessingStrategyServantActivator : public RequestProcessingStrategyServantManager { public: diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 3f7a3bd349e..766fb256043 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -72,17 +72,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<RequestProcessingStrategyServantActivatorFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyServantActivatorFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyServantActivatorFactoryImpl) } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index 9084b7758bd..103ccba19fc 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -14,13 +14,12 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "RequestProcessingStrategyServantManager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RequestProcessingStrategyServantManager.h" #include "Servant_Location.h" #include "PortableServer.h" @@ -38,7 +37,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export RequestProcessingStrategyServantLocator + class RequestProcessingStrategyServantLocator : public RequestProcessingStrategyServantManager { public: diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index 187dc825aba..bf962eaf46c 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -72,17 +72,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<RequestProcessingStrategyServantLocatorFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyServantLocatorFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyServantLocatorFactoryImpl) } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index fa7b01bd416..f68cc5d887d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -14,13 +14,12 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RequestProcessingStrategy.h" #include "Servant_Location.h" #include "PortableServer.h" @@ -30,7 +29,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export RequestProcessingStrategyServantManager + class RequestProcessingStrategyServantManager : public RequestProcessingStrategy { public: diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 96128f3d920..83529bc8cb8 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -14,13 +14,12 @@ #define TAO_SERVANTRETENTIONSTRATEGY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Policy_Strategy.h" #include "Servant_Location.h" #include "Servant_Upcall.h" #include "ServantRetentionPolicyC.h" @@ -34,7 +33,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ServantRetentionStrategy + class ServantRetentionStrategy : public Policy_Strategy { public: diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index e00faa806cd..1e4d947f999 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -85,13 +85,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<ServantRetentionStrategyFactoryImpl>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyFactoryImpl> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyFactoryImpl) } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 7262b3d8a90..0cc33443c9a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -14,14 +14,13 @@ #define TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "ServantRetentionStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "Servant_Location.h" -#include "ServantRetentionStrategy.h" class TAO_Root_POA; @@ -29,7 +28,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ServantRetentionStrategyNonRetain + class ServantRetentionStrategyNonRetain : public ServantRetentionStrategy { public: diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index 892a724c01d..8703ddb53f6 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -59,17 +59,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<ServantRetentionStrategyNonRetainFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyNonRetainFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyNonRetainFactoryImpl) } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 738f58fdd3c..789604bbb9b 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -14,21 +14,19 @@ #define TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "ServantRetentionStrategyNonRetain.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ServantRetentionStrategyNonRetain.h" - class TAO_Root_POA; namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ServantRetentionStrategyRetain + class ServantRetentionStrategyRetain : public ServantRetentionStrategyNonRetain { public: diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index 61d8167a294..476ea401ebf 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -57,13 +57,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<ServantRetentionStrategyRetainFactoryImpl>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyRetainFactoryImpl> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyRetainFactoryImpl) } } diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h index 25627b8a603..54546f1f946 100644 --- a/TAO/tao/PortableServer/StrategyFactory.h +++ b/TAO/tao/PortableServer/StrategyFactory.h @@ -13,19 +13,17 @@ #define TAO_PORTABLESERVER_STRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Object.h" - namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export StrategyFactory : + class StrategyFactory : public ACE_Service_Object { public: diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index bb46642f7f8..fe992cb580e 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -14,22 +14,20 @@ #define TAO_THREAD_STRATEGY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Policy_Strategy.h" #include "ThreadPolicyC.h" - #include "tao/orbconf.h" namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ThreadStrategy : + class ThreadStrategy : public Policy_Strategy { public: diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h index 120ca7e115a..5dea79f8b41 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactory.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h @@ -14,14 +14,13 @@ #define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "StrategyFactory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/ThreadPolicyC.h" +#include "ThreadPolicyC.h" namespace TAO { @@ -29,7 +28,7 @@ namespace TAO { class ThreadStrategy; - class TAO_PortableServer_Export ThreadStrategyFactory + class ThreadStrategyFactory : public StrategyFactory { public: diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index 4f0c738e4ee..b12fb95bb29 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -90,17 +90,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategyFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<ThreadStrategyFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<ThreadStrategyFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategyFactoryImpl) } } diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp index ea9e9e68bdb..0212e5a092e 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp @@ -32,7 +32,7 @@ namespace TAO return ::PortableServer::SINGLE_THREAD_MODEL; } - ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategySingle) + ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingle) ACE_STATIC_SVC_DEFINE ( ThreadStrategySingle, @@ -42,12 +42,6 @@ namespace TAO ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0 ) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<ThreadStrategySingle>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<ThreadStrategySingle> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index e8c79fe7676..e5df89cc177 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -59,17 +59,7 @@ namespace TAO 0 ) - ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategySingleFactoryImpl) - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class ACE_Dynamic_Service<ThreadStrategySingleFactoryImpl>; - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - #pragma instantiate ACE_Dynamic_Service<ThreadStrategySingleFactoryImpl> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingleFactoryImpl) } } diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index 050ed5a6c71..260ea7cf4bc 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -29,7 +29,7 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ThreadStrategySingleFactoryImpl + class ThreadStrategySingleFactoryImpl : public ThreadStrategyFactory { public: |