Fri Nov 9 09:04:21 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 28 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 907d1c2dcfc..7aed0328b2b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Fri Nov  9 09:04:21 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TAO_Singleton_Manager.cpp:
+          dynamically_allocated is a bool
+
+        * tao/PI/PI.cpp:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.{h,cpp}:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
+          Layout changes
+
+        * tao/ORBInitializer_Registry.cpp:
+          With VxWorks and TSS emulation enabled we do need to search the
+          global registry because the loader which creates the global registry
+          is a different thread then the thread that executes main
+
 Wed Nov  7 18:48:15 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Portable_Interceptors/Bug_2133/*:
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")));
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index d670c3ab051..d49005fa05b 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -33,12 +33,10 @@ namespace TAO
   int
   ORT_Adapter_Factory_Impl::Initializer (void)
   {
-    TAO_Root_POA::ort_adapter_factory_name ("Concrete_ORT_Adapter_Factory"
-      );
+    TAO_Root_POA::ort_adapter_factory_name ("Concrete_ORT_Adapter_Factory");
 
     return ACE_Service_Config::process_directive (
-          ace_svc_desc_ORT_Adapter_Factory_Impl
-        );
+          ace_svc_desc_ORT_Adapter_Factory_Impl);
   }
 }
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
index 397addb069c..b149e24a073 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -61,7 +61,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 ACE_STATIC_SVC_DECLARE (ORT_Adapter_Factory_Impl)
 ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl)
 
-
 #define TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
 #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 #undef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 11abf6d283e..54b9891e22d 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -39,7 +39,6 @@ TAO_PI_Init::Initializer (void)
   try
     {
       /// Register the PI ORBInitializer.
-
       ACE_NEW_THROW_EX (temp_orb_initializer,
                         TAO_PI_ORBInitializer,
                         CORBA::NO_MEMORY (
@@ -50,8 +49,7 @@ TAO_PI_Init::Initializer (void)
 
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                    );
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
   catch (const ::CORBA::Exception& ex)
     {
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index 345d30cb3f9..4c4151de3b0 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -72,7 +72,7 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void)
 
 TAO_Singleton_Manager::~TAO_Singleton_Manager (void)
 {
-  this->dynamically_allocated_ = 0;   // Don't delete this again in fini()
+  this->dynamically_allocated_ = false;   // Don't delete this again in fini()
   (void) this->fini ();
 }
 
@@ -113,7 +113,7 @@ TAO_Singleton_Manager::instance (void)
                       0);
       ACE_ASSERT (instance_pointer == the_instance);
 
-      instance_pointer->dynamically_allocated_ = 1;
+      instance_pointer->dynamically_allocated_ = true;
 
       return instance_pointer;
     }