Merged revisions 81301 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO

........
  r81301 | johnnyw | 2008-04-09 13:02:14 -0500 (Wed, 09 Apr 2008) | 1 line
  
  Wed Apr  9 18:01:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........

6 files changed, 34 insertions, 56 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 21531769000..892a382f088 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Wed Apr  9 18:01:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Default_Thread_Lane_Resources_Manager.cpp:
+        * tao/IORManipulation/IORManip_Loader.cpp:
+          Layout changes
+
+        * tao/IORManipulation/IORManipulation.h:
+          Doxygen and layout changes
+
+        * tao/ORBInitializer_Registry.cpp:
+          Removed VxWorks specific code, with the new SG/SC implementation
+          this shouldn't be needed anymore.
+
+        * tao/Transport_Cache_Manager.cpp:
+          Const and layout changes
+
 Wed Apr  9 14:00:34 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * tao/ORB.cpp:
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index f3e03b9f15f..94edfb8f666 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -34,15 +34,12 @@ TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (void)
 
   TAO_EndpointSet endpoint_set;
 
-  params->get_endpoint_set (TAO_DEFAULT_LANE,
-                            endpoint_set);
+  params->get_endpoint_set (TAO_DEFAULT_LANE, endpoint_set);
 
   bool ignore_address = false;
 
   int const result =
-    this->lane_resources_->open_acceptor_registry (endpoint_set,
-                                                   ignore_address
-                                                  );
+    this->lane_resources_->open_acceptor_registry (endpoint_set, ignore_address);
 
   return result;
 }
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index c27bad8106d..05e766c4905 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -16,9 +16,7 @@ TAO_IORManip_Loader::TAO_IORManip_Loader (void)
 }
 
 CORBA::Object_ptr
-TAO_IORManip_Loader::create_object (CORBA::ORB_ptr,
-                                    int,
-                                    ACE_TCHAR *[])
+TAO_IORManip_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR *[])
 {
   CORBA::Object_ptr obj;
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index 7e24336b88c..d7b51fcf0d8 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -39,74 +39,49 @@ class TAO_IOR_Manipulation_impl
   : public TAO_IOP::TAO_IOR_Manipulation,
     public TAO_Local_RefCounted_Object
 {
-  // = TITLE
-  //     IOR Manipulation class
-  //
-  // = DESCRIPTION
-  //
-  //
 public:
 
-  /// constructor
+  /// Constructor
   TAO_IOR_Manipulation_impl (void);
 
   virtual CORBA::Object_ptr merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    );
+    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors);
 
   virtual CORBA::Object_ptr add_profiles (
-      CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2
-      );
+      CORBA::Object_ptr ior1, CORBA::Object_ptr ior2);
 
   virtual CORBA::Object_ptr remove_profiles (
-    CORBA::Object_ptr group,
-    CORBA::Object_ptr ior2
-    );
+    CORBA::Object_ptr group, CORBA::Object_ptr ior2);
 
   virtual CORBA::Boolean set_property (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr group
-      )
-;
+      TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group);
 
   // @@ note awkward argument order
   virtual CORBA::Boolean set_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr new_primary,
-      CORBA::Object_ptr group
-      )
-;
+      CORBA::Object_ptr group);
 
   virtual CORBA::Object_ptr get_primary (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr group
-      )
-;
+      TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group);
 
   virtual CORBA::Boolean is_primary_set (
       TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr group
-      )
-;
+      CORBA::Object_ptr group);
 
    virtual CORBA::Boolean remove_primary_tag (
        TAO_IOP::TAO_IOR_Property_ptr prop,
-       CORBA::Object_ptr iogr
-       );
+       CORBA::Object_ptr iogr);
 
   virtual CORBA::ULong is_in_ior (
     CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2
-    );
+    CORBA::Object_ptr ior2);
 
-  virtual CORBA::ULong get_profile_count (
-    CORBA::Object_ptr group
-    );
+  virtual CORBA::ULong get_profile_count (CORBA::Object_ptr group);
 
 protected:
 
-  /// destructor
+  /// Destructor
   ~TAO_IOR_Manipulation_impl (void);
 
 };
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index ca7fbf64476..b924864cc13 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -43,16 +43,10 @@ namespace PortableInterceptor
         }
     }
 
-#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", lookup); // only look in the local repo
+      ("ORBInitializer_Registry", true); // only look in the local repo
 
 #if !defined (TAO_AS_STATIC_LIBS)
     if (orbinitializer_registry_ == 0)
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 2ff69e5c90b..7821bdffddd 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -386,7 +386,7 @@ namespace TAO
       }
 
     // Remove the entry from the Map
-    int retval = this->cache_map_.unbind (entry);
+    int const retval = this->cache_map_.unbind (entry);
 
     // Set the entry pointer to zero
     entry = 0;
@@ -425,9 +425,7 @@ namespace TAO
       }
 
     // Now do a bind again with the new index
-    return  this->cache_map_.bind (key,
-                                   val,
-                                   entry);
+    return  this->cache_map_.bind (key, val, entry);
   }