Tue Mar 4 10:10:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 20 insertions, 36 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 763318caf95..82f823fcc45 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Tue Mar  4 10:10:30 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Table.{h,cpp,inl}:
+          Removed obsolete methods and members
+
+        * tao/PI/Interceptor_List_T.{h,cpp}:
+          Const changes
+
+        * tao/Policy_Validator.h:
+        * tao/TAO_Server_Request.h:
+          Layout changes
+
 Mon Mar  3 14:52:30 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/GIOP_Message_Generator_Parser.h:
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index 8624370348c..70e1dda62ac 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -23,9 +23,7 @@ TAO::ORB_Table::ORB_Table (void)
   : lock_ (),
     first_orb_not_default_ (false),
     table_ (TAO_DEFAULT_ORB_TABLE_SIZE),
-    first_orb_ (0),
-    orbs_ (0),
-    num_orbs_ (0)
+    first_orb_ (0)
 {
 }
 
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index 5365b0b04f4..d2e638ed91b 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -99,8 +99,6 @@ namespace TAO
     int unbind (const char *orb_id);
     //@}
 
-    ::TAO_ORB_Core * const * get_orbs (size_t& num_orbs);
-
     /// Obtain the first ORB for the @c ORB_Core_instance()
     /// implementation.
     ::TAO_ORB_Core * first_orb (void);
@@ -146,16 +144,6 @@ namespace TAO
 
     /// The first ORB created by the user
     ::TAO_ORB_Core * first_orb_;
-
-    /// List of orbs for get_orbs call
-    /**
-     * @todo ORB_Table::orbs_ appears to be unused.  Remove it?
-     */
-    ::TAO_ORB_Core ** orbs_;
-
-    /// Number of ORBs in the table.
-    size_t num_orbs_;
-
   };
 
   // -----------------------------------------------
@@ -190,9 +178,7 @@ namespace TAO
     ::TAO_ORB_Core * core (void) const { return this->core_; }
 
   private:
-
     ::TAO_ORB_Core * core_;
-
   };
 
 }
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
index 40cb80e4d70..b047b8f0493 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -26,13 +26,6 @@ TAO::ORB_Table::end (void)
   return this->table_.end ();
 }
 
-ACE_INLINE ::TAO_ORB_Core* const *
-TAO::ORB_Table::get_orbs (size_t& num_orbs)
-{
-  num_orbs = this->num_orbs_;
-  return this->orbs_;
-}
-
 /// Accessor to the underlying table_
 ACE_INLINE TAO::ORB_Table::Table *
 TAO::ORB_Table::table (void)
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index a94957a33d0..d618f78a3de 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -34,7 +34,7 @@ namespace TAO
 
   template <typename InterceptorType, typename DetailsType>
   size_t
-  Interceptor_List<InterceptorType,DetailsType>::size (void)
+  Interceptor_List<InterceptorType,DetailsType>::size (void) const
   {
     return this->interceptors_.size ();
   }
@@ -166,7 +166,7 @@ namespace TAO
         details.apply_policies(policies);
 
         /// Increase the length of the Interceptor sequence by one.
-        const size_t new_len = old_len + 1;
+        size_t const new_len = old_len + 1;
         this->interceptors_.size (new_len);
 
         // Add the interceptor
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index 6a15e8f1b4c..7a7d49c71dc 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -78,10 +78,9 @@ namespace TAO
     /// Return the interceptor in sequence element @a index.
     InterceptorType_ptr_type interceptor (size_t index);
 
-    size_t size (void);
+    size_t size (void) const;
 
   private:
-
     typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray;
 
     /// Dynamic array of registered interceptors.
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index fdb948bb7d3..d91dd67a122 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -49,7 +49,6 @@ namespace CORBA
  *  for the policies in the POA. This class seems so much useful for
  *  passing policy information between different loaded libraries.
  */
-
 class TAO_Export TAO_Policy_Validator
 {
 public:
@@ -88,10 +87,9 @@ public:
    */
   void add_validator (TAO_Policy_Validator *validator);
 
-
- /**
-  * Accessor for the stored ORB core reference
-  */
+  /**
+   * Accessor for the stored ORB core reference
+   */
  TAO_ORB_Core & orb_core() const;
 
 protected:
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 709a19aa588..f0cd4e25724 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -137,9 +137,7 @@ public:
   const char *operation (void) const;
 
   /// Set the operation name.
-  void operation (const char *operation,
-                  size_t length,
-                  int release);
+  void operation (const char *operation, size_t length, int release);
 
   /// Return the length of the operation.
   size_t operation_length (void) const;