1 files changed, 17 insertions, 16 deletions

diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index 4838b0754da..1b35ae545b0 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -30,8 +30,6 @@
 #include "ace/Thread_Mutex.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declarations.
 class TAO_ORB_Core;
 
@@ -62,7 +60,6 @@ namespace TAO
    */
   class TAO_Export ORB_Table
   {
-  friend class ::TAO_ORB_Core;
   public:
 
     /// Constructor
@@ -87,7 +84,7 @@ namespace TAO
     //@{
     iterator begin (void);
     iterator end (void);
-    int bind (const char *orb_id, ::TAO_ORB_Core *orb_core);
+    int bind (const char *orb_id, TAO_ORB_Core *orb_core);
 
     /// Return @c TAO_ORB_Core corresponding to ORB with given @a
     /// orb_id.
@@ -95,16 +92,16 @@ namespace TAO
      * @note The caller must decrease the reference count on the
      *       returned ORB_Core, i.e. the callers "owns" it.
      */
-    ::TAO_ORB_Core* find (const char *orb_id);
+    TAO_ORB_Core* find (const char *orb_id);
 
     int unbind (const char *orb_id);
     //@}
 
-    ::TAO_ORB_Core * const * get_orbs (size_t& num_orbs);
+    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);
+    TAO_ORB_Core * first_orb (void);
 
     /// Return a unique instance
     static ORB_Table * instance (void);
@@ -128,12 +125,18 @@ namespace TAO
 
     /// Return @c TAO_ORB_Core corresponding to ORB with given @a
     /// orb_id.  (underlying unlocked implementation).
-    ::TAO_ORB_Core * find_i (char const * orb_id);
+    TAO_ORB_Core * find_i (char const * orb_id);
+
+    /// Update our list of orbs
+    /**
+     * @todo Where the implementation for ORB_Table::update_orbs?
+     */
+    void update_orbs (void);
 
   private:
 
     /// Lock used to synchronize access to the internal state.
-    ::TAO_SYNCH_MUTEX lock_;
+    TAO_SYNCH_MUTEX lock_;
 
     /// Variable to check if the first ORB decides not to be the
     /// default.
@@ -143,13 +146,13 @@ namespace TAO
     Table table_;
 
     /// The first ORB created by the user
-    ::TAO_ORB_Core * first_orb_;
+    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_;
+    TAO_ORB_Core ** orbs_;
 
     /// Number of ORBs in the table.
     size_t num_orbs_;
@@ -173,7 +176,7 @@ namespace TAO
     ORB_Core_Ref_Counter (void);
 
     /// Constructor.
-    ORB_Core_Ref_Counter (::TAO_ORB_Core * core);
+    ORB_Core_Ref_Counter (TAO_ORB_Core * core);
 
     /// Destructor.
     ~ORB_Core_Ref_Counter (void);
@@ -185,18 +188,16 @@ namespace TAO
     void operator= (ORB_Core_Ref_Counter const & rhs);
 
     /// ORB_Core pointer accessor.
-    ::TAO_ORB_Core * core (void) const { return this->core_; }
+    TAO_ORB_Core * core (void) const { return this->core_; }
 
   private:
 
-    ::TAO_ORB_Core * core_;
+    TAO_ORB_Core * core_;
 
   };
 
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
 # include "tao/ORB_Table.inl"
 #endif /* __ACE_INLINE__ */