diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-16 17:38:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-16 17:38:12 +0000 |
| commit | 3325541f03f1f54a202890dfcfe7d4be531c0455 (patch) | |
| tree | 0487569b332879aad4ae886413cecb1d27841656 | |
| parent | 9391cb71fa0b6ce5166bb0b2fc417d926b465d37 (diff) | |
| download | ATCD-3325541f03f1f54a202890dfcfe7d4be531c0455.tar.gz | |
ChangeLogTag: Thu Jun 16 17:37:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 29 |
2 files changed, 13 insertions, 21 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4d5bc4851f1..bdac71abde6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 16 17:37:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/TAO_Internal.cpp: + Do the initialisation of the messaging loader earlier + Thu Jun 16 16:47:42 2005 Simon McQueen <sm@prismtech.com> * orbsvcs/IFR_Service/be_produce.cpp: diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 742d312a153..65be89619ea 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -367,6 +367,14 @@ namespace adapter_factory->init (0, 0); } + ACE_Service_Object * const messaging_loader = + ACE_Dynamic_Service<ACE_Service_Object>::instance ("Messaging_Loader"); + + if (messaging_loader != 0) + { + messaging_loader->init (0, 0); + } + // Handle RTCORBA library special case. Since RTCORBA needs // its init method call to register several hooks, call it // here if it hasn't already been called. @@ -386,14 +394,6 @@ namespace rtscheduler_loader->init (0, 0); } - ACE_Service_Object * const messaging_loader = - ACE_Dynamic_Service<ACE_Service_Object>::instance ("Messaging_Loader"); - - if (messaging_loader != 0) - { - messaging_loader->init (0, 0); - } - // @@ What the heck do these things do and do we need to avoid // calling them if we're not invoking the svc.conf file? // @@ They are needed for platforms that have no file system, @@ -420,16 +420,3 @@ namespace } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<ACE_Service_Object>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Dynamic_Service<ACE_Service_Object> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE) -# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Env_Value<u_int>; -# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Env_Value<u_int> -# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_DEBUG && !ACE_HAS_WINCE */ |