diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-09 09:04:45 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-09 09:04:45 +0000 |
| commit | 3d8c3b1c2b5eb30a04d8019406a27cde14ac8048 (patch) | |
| tree | ca8731c85995e7213891eb3b276e47369bff3e48 /TAO/tao/ORBInitializer_Registry.cpp | |
| parent | a3dc781d343bffbb4e6bea466b1e19810830b395 (diff) | |
| download | ATCD-3d8c3b1c2b5eb30a04d8019406a27cde14ac8048.tar.gz | |
Fri Nov 9 09:04:21 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/ORBInitializer_Registry.cpp')
| -rw-r--r-- | TAO/tao/ORBInitializer_Registry.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index c1a4a0778a3..b3c16fc8706 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -45,10 +45,16 @@ namespace PortableInterceptor TAO::ORB::init_orb_globals (); } +#if defined (ACE_VXWORKS) && defined (ACE_HAS_TSS_EMULATION) + bool const lookup = false; +#else + bool const lookup = true; +#endif + // If not, look it up. TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_ = ACE_Dynamic_Service<TAO::ORBInitializer_Registry_Adapter>::instance - ("ORBInitializer_Registry", true); // only look in the local repo + ("ORBInitializer_Registry", lookup); // only look in the local repo #if !defined (TAO_AS_STATIC_LIBS) if (orbinitializer_registry_ == 0) @@ -71,7 +77,7 @@ namespace PortableInterceptor else { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("TAO (%P|%t) %p\n"), ACE_TEXT ("ERROR: ORBInitializer Registry unable to find the ") ACE_TEXT ("ORBInitializer Registry instance"))); |