From 3d8c3b1c2b5eb30a04d8019406a27cde14ac8048 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 9 Nov 2007 09:04:45 +0000 Subject: Fri Nov 9 09:04:21 UTC 2007 Johnny Willemsen --- TAO/tao/ORBInitializer_Registry.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'TAO/tao/ORBInitializer_Registry.cpp') 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::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"))); -- cgit v1.2.1