diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-09 16:33:05 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-09 16:33:05 +0000 |
| commit | 4e76a0bf8bf5ed2ccb0138fafa3b4c7b8463dd8d (patch) | |
| tree | caccdd2ad72ff38ed836dc945dde12dc006ced9f | |
| parent | c33b06970aaaddf7a7e0e75e8ebf6ef9b4aaeeca (diff) | |
| download | ATCD-4e76a0bf8bf5ed2ccb0138fafa3b4c7b8463dd8d.tar.gz | |
Must not depend on static variables to add services.
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/default_client.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/default_server.cpp | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 5b515d7ca65..72fcc7e1443 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1795,5 +1795,4 @@ ACE_STATIC_SVC_DEFINE (TAO_Resource_Factory, &ACE_SVC_NAME (TAO_Resource_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) -ACE_STATIC_SVC_REQUIRE (TAO_Resource_Factory) ACE_FACTORY_DEFINE (TAO, TAO_Resource_Factory) diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 96ce5337616..360866a6a86 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -31,6 +31,13 @@ TAO_Internal::open_services (int& argc, char** argv, int ignore_default_svc_conf if (TAO_Internal::service_open_count_++ == 0) { + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_Resource_Factory); + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_Default_Client_Strategy_Factory); + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_Default_Server_Strategy_Factory); + int retv = ACE_Service_Config::open (argc, argv, ACE_DEFAULT_LOGGER_KEY, 0, // Don't ignore static services. diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 66d6d25e918..d8062f7fc03 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -115,5 +115,4 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory, &ACE_SVC_NAME (TAO_Default_Client_Strategy_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) -ACE_STATIC_SVC_REQUIRE (TAO_Default_Client_Strategy_Factory) ACE_FACTORY_DEFINE (TAO, TAO_Default_Client_Strategy_Factory) diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index 628aba00ff8..9073b72189e 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -428,5 +428,4 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory, &ACE_SVC_NAME (TAO_Default_Server_Strategy_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) -ACE_STATIC_SVC_REQUIRE (TAO_Default_Server_Strategy_Factory) ACE_FACTORY_DEFINE (TAO, TAO_Default_Server_Strategy_Factory) |