Tue Oct 10 12:11:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 191 insertions, 194 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 75fba177208..acc43673ff4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Tue Oct 10 12:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+	* orbsvcs/examples/ORT/README:
+	  Layout improvement
+
+	* orbsvcs/orbsvcs/CosConcurrencyControl.idl:
+	* orbsvcs/orbsvcs/CosLoadBalancing.idl:
+	* orbsvcs/orbsvcs/CosNaming.idl:
+	  Doxygen improvements
+
+	* orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
+	  Const/bool improvements
+
 Tue Oct 10 09:24:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 	* docs/ior_parsing.html:
diff --git a/TAO/orbsvcs/examples/ORT/README b/TAO/orbsvcs/examples/ORT/README
index 2b1b313b3e6..58b9de1fba4 100644
--- a/TAO/orbsvcs/examples/ORT/README
+++ b/TAO/orbsvcs/examples/ORT/README
@@ -4,7 +4,7 @@ This example shows the use of ORT Template by a simple application.
 
 Scenario:
 ========
-	
+
 1. There's a server which has a dummy method that adds the two 'in' variables
    and return the sum to the client.
 
@@ -23,7 +23,8 @@ Gateway.idl			IDL for the Gateway
 
 Gateway_IORInterceptor		IORInterceptor for the Gateway.
 
-Gateway_i			Implementation of the Gateway which changes the 				DSI to DII.
+Gateway_i                       Implementation of the Gateway which changes the
+                                DSI to DII.
 
 Object_Factory_i		Implementation for the
 				Gateway IDL method. This method
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
index 3579be999c3..ba8d4cd9c64 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
@@ -36,7 +36,7 @@
 
 #pragma prefix "omg.org"
 
-module CosConcurrencyControl 
+module CosConcurrencyControl
 {
   // = TITLE
   //     CosConcurrencyControl
@@ -48,11 +48,11 @@ module CosConcurrencyControl
   //     the object is not compromised when accessed by concurrently
   //     executing computations.
 
-  // = These are the different lock types supported by this module. 
+  // = These are the different lock types supported by this module.
 
   // For a description of the compatability between the different lock
   // types please consult the service description (OMG).
-  enum lock_mode 
+  enum lock_mode
   {
     read,
     write,
@@ -61,10 +61,10 @@ module CosConcurrencyControl
     intention_write
   };
 
+  /// The LockNotHeld exception is is raised when an operation to
+  /// unlock or change the mode of a lock is called and the specified
+  /// lock is not held
   exception LockNotHeld {};
-  // The LockNotHeld exception is is raised when an operation to
-  // unlock or change the mode of a lock is called and the specified
-  // lock is not held
 
 #ifdef TAO_HAS_TRANSACTION_CONTROL_SERVICE
   // @@ The lock coordinator is designed for transactional lock sets,
@@ -74,12 +74,12 @@ module CosConcurrencyControl
       // = TITLE
       //     LockCoordinator drops all locks associated with a transaction.
       // = DESCRIPTION
-      //     The LockCoordinator interface enables a transaction service to 
+      //     The LockCoordinator interface enables a transaction service to
       //     drop all locks held by a transaction.
 
-      void drop_locks ();
       // Releases all the locks held by the transaction. Designet to be
       // used by transaction service when a transaction commits or aborts.
+      void drop_locks ();
     };
 #endif /* TAO_HAS_TRANSACTION_CONTROL_SERVICE */
 
@@ -87,7 +87,7 @@ module CosConcurrencyControl
     {
       // = TITLE
       //     LockSet inteface to the concurrency service in implicit
-      //     mode. 
+      //     mode.
       //
       // = DESCRIPTION
       //     Clients operating in the implicit mode
@@ -131,7 +131,7 @@ module CosConcurrencyControl
       // = TITLE
       //     TransactionalLockSet interface to the concurrency service
       //     in transactional mode.
-      // 
+      //
       // = DESCRIPTION
       //     Clients operating in the transactional mode acquire and
       //     release locks in lock sets through this interface. The
@@ -141,26 +141,26 @@ module CosConcurrencyControl
       //     transaction is explicitly passed as a reference to the
       //     operations. Please see the description of the LockSet
       //     interface for a detailed description.
-      
+
       void lock (in CosTransactions::Coordinator current,
                  in lock_mode mode);
       // See LockSet::lock
-      
+
       boolean try_lock (in CosTransactions::Coordinator current,
                         in lock_mode mode);
       // See LockSet::try_lock
-      
+
       void unlock (in CosTransactions::Coordinator current,
                    in lock_mode mode)
         raises (LockNotHeld);
       // See LockSet::unlock
-      
+
       void change_mode (in CosTransactions::Coordinator current,
                         in lock_mode held_mode,
                         in lock_mode new_mode)
         raises (LockNotHeld);
       // See LockSet::change_mode
-      
+
       LockCoordinator get_coordinator (in CosTransactions::Coordinator which);
       // See LockSet::get_coordinator
     };
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.idl b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.idl
index b93e66a11b6..f2e468b850e 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.idl
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.idl
@@ -74,29 +74,29 @@ module CosLoadBalancing
 
     Properties get_properties ();
 
-    // Report loads at given location to the LoadManager.
+    /// Report loads at given location to the LoadManager.
     void push_loads (in PortableGroup::Location the_location,
                      in LoadList loads)
       raises (StrategyNotAdaptive);
 
-    // Get loads, if any, at the given location.  Load balancing
-    // strategies may use this method to query loads at specific
-    // locations.  Returned loads are the effective loads computed by
-    // the Strategy, as opposed to the raw loads maintained by the
-    // LoadManager.
+    /// Get loads, if any, at the given location.  Load balancing
+    /// strategies may use this method to query loads at specific
+    /// locations.  Returned loads are the effective loads computed by
+    /// the Strategy, as opposed to the raw loads maintained by the
+    /// LoadManager.
     LoadList get_loads (in LoadManager load_manager,
                         in PortableGroup::Location the_location)
       raises (LocationNotFound);
 
-    // Return the next member from the given object group which will
-    // requests will be forward to.
+    /// Return the next member from the given object group which will
+    /// requests will be forward to.
     Object next_member (in PortableGroup::ObjectGroup object_group,
                         in LoadManager load_manager)
       raises (PortableGroup::ObjectGroupNotFound,
               PortableGroup::MemberNotFound);
 
-    // Ask the Strategy to analyze loads, and enable or disable alerts
-    // at object group members residing at appropriate locations.
+    /// Ask the Strategy to analyze loads, and enable or disable alerts
+    /// at object group members residing at appropriate locations.
     oneway void analyze_loads (in PortableGroup::ObjectGroup object_group,
                                in LoadManager load_manager);
 
@@ -108,7 +108,7 @@ module CosLoadBalancing
 
   typedef Strategy CustomStrategy;
 
-  // Property value for built-in load balancing Strategy.
+  /// Property value for built-in load balancing Strategy.
   struct StrategyInfo
   {
     string name;
@@ -117,81 +117,81 @@ module CosLoadBalancing
 
   interface LoadAlert
   {
-    // Forward requests back to the load manager via the object group
-    // reference.
+    /// Forward requests back to the load manager via the object group
+    /// reference.
     void enable_alert ();
 
-    // Stop forwarding requests, and begin accepting them again.
+    /// Stop forwarding requests, and begin accepting them again.
     void disable_alert ();
   };
 
-  // Interface that all load monitors must implement.
+  /// Interface that all load monitors must implement.
   interface LoadMonitor
   {
-    // Retrieve the location at which the LoadMonitor resides.
+    /// Retrieve the location at which the LoadMonitor resides.
     readonly attribute Location the_location;
 
-    // Retrieve the current load at the location LoadMonitor resides.
+    /// Retrieve the current load at the location LoadMonitor resides.
     readonly attribute LoadList loads;
   };
 
-  // Specification of LoadManager Interface
+  /// Specification of LoadManager Interface
   interface LoadManager
     : PortableGroup::PropertyManager,
       PortableGroup::ObjectGroupManager,
       PortableGroup::GenericFactory
   {
-    // For the PUSH load monitoring style.
+    /// For the PUSH load monitoring style.
     void push_loads (in PortableGroup::Location the_location,
                      in LoadList loads);
 
-    // Return the raw loads at the given location, as opposed to the
-    // potentially different effective loads returned by the
-    // Strategy::get_loads() method.
+    /// Return the raw loads at the given location, as opposed to the
+    /// potentially different effective loads returned by the
+    /// Strategy::get_loads() method.
     LoadList get_loads (in PortableGroup::Location the_location)
       raises (LocationNotFound);
 
-    // Inform member at given location of load alert condition.
+    /// Inform member at given location of load alert condition.
     void enable_alert (in PortableGroup::Location the_location)
       raises (LoadAlertNotFound);
 
-    // Inform member at given location that load alert condition has
-    // passed.
+    /// Inform member at given location that load alert condition has
+    /// passed.
     void disable_alert (in PortableGroup::Location the_location)
       raises (LoadAlertNotFound);
 
-    // Register a LoadAlert object for the member at the given
-    // location.
+    /// Register a LoadAlert object for the member at the given
+    /// location.
     void register_load_alert (in PortableGroup::Location the_location,
                               in LoadAlert load_alert)
       raises (LoadAlertAlreadyPresent,
               LoadAlertNotAdded);
 
-    // Retrieve the LoadAlert object for the member at the given
-    // location.
+    /// Retrieve the LoadAlert object for the member at the given
+    /// location.
     LoadAlert get_load_alert (in PortableGroup::Location the_location)
       raises (LoadAlertNotFound);
 
-    // Remove (de-register) the LoadAlert object for the member at the
-    // given location.
+    /// Remove (de-register) the LoadAlert object for the member at the
+    /// given location.
     void remove_load_alert (in PortableGroup::Location the_location)
       raises (LoadAlertNotFound);
 
     // The following load monitor methods are only used for the PULL
     // load monitoring style.
 
-    // Register a LoadMonitor object for "pull" monitoring of the
-    // given location.
+    /// Register a LoadMonitor object for "pull" monitoring of the
+    /// given location.
     void register_load_monitor (in PortableGroup::Location the_location,
                                 in LoadMonitor load_monitor)
       raises (MonitorAlreadyPresent);
 
-    // Retrieve the LoadMonitor object for the given location.
+    /// Retrieve the LoadMonitor object for the given location.
     LoadMonitor get_load_monitor (in PortableGroup::Location the_location)
       raises (LocationNotFound);
 
-    // Remove (de-register) the LoadMonitor object for the given
-    // location.
+    /// Remove (de-register) the LoadMonitor object for the given
+    ///  location.
     void remove_load_monitor (in PortableGroup::Location the_location)
       raises (LocationNotFound);
 
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.idl b/TAO/orbsvcs/orbsvcs/CosNaming.idl
index 78241d6a49d..5b0237d6443 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.idl
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.idl
@@ -19,64 +19,61 @@
 
 #pragma prefix "omg.org"
 
+/**
+ * This module provides interface for using COS Naming Service.
+ */
 module CosNaming
 {
-  // = TITLE
-  // This module provides interface for using COS Naming Service.
-
+  /// Define a typedef for String.  Maybe at some point, <Istring> will
+  /// be different to support Internationalization.
   typedef string Istring;
-  // Define a typedef for String.  Maybe at some point, <Istring> will
-  // be different to support Internationalization.
 
+  /*
+   * This is a 'simple' name.
+   *
+   * Both id and kind fields are used in resolving names.
+   */
   struct NameComponent
   {
-    // = TITLE
-    //   This is a 'simple' name.
-    //
-    // = DESCRIPTION
-    //   Both id and kind fields are used in resolving names.
-
+    /// This is the name that is used to identify object references.
     Istring id;
-    // This is the name that is used to identify object references.
 
+    /// Stores any additional info about the object reference.
     Istring kind;
-    // Stores any addtional info about the object reference.
   };
 
+  /// This is a compound name: <c1; c2; c3; cn> where c1 to cn-1 are
+  /// the names of the nested contexts, and cn is the name of the
+  /// object bound in cn-1.
   typedef sequence <NameComponent> Name;
-  // This is a compound name: <c1; c2; c3; cn> where c1 to cn-1 are
-  // the names of the nested contexts, and cn is the name of the
-  // object bound in cn-1.
 
   enum BindingType
   {
+    /// object binding.
     nobject,
-    // object binding.
 
+    /// Naming context binding.
     ncontext
-    // Naming context binding.
   };
 
   struct Binding
   {
+    /// Simple name, under which an object is bound in a given context.
     Name binding_name;
-    // Simple name, under which an object is bound in a given context.
 
+    /// Indicates whether the binding_name identifies a context, and, therefore, can
+    /// participate in name resolution.
     BindingType	binding_type;
-    // Indicates whether the binding_name identifies a context, and, therefore, can
-    // participate in name resolution.
   };
 
   typedef sequence <Binding> BindingList;
 
-  interface BindingIterator;
   // Forward declaration.
+  interface BindingIterator;
 
+  /// Interface for managing name bindings and naming contexts.
   interface NamingContext
     {
-      // = TITLE
-      // Interface for managing name bindings and naming contexts.
-
       // = Exceptions.
 
       enum NotFoundReason
@@ -86,205 +83,191 @@ module CosNaming
 	      not_object
       };
 
+      /// Indicates that the name does not identify a binding.
       exception NotFound
 	    {
-        // = TITLE
-        //   Indicates that the name does not identify a binding.
 
 	      NotFoundReason why;
 	      Name rest_of_name;
 	    };
 
+      /// Implementation may throw this exception if some reason it cannot
+      /// complete the operation.  This is currently not used in TAO.
       exception CannotProceed
 	    {
-        // = TITLE
-        // Implementation may throw this exception if some reason it cannot
-	      // complete the operation.  This is currently not used in TAO.
 
 	      NamingContext cxt;
 	      Name rest_of_name;
 	    };
 
-      exception InvalidName 
+      /// A name of length 0 is invalid.  Implementations may place
+      /// further restrictions.
+      exception InvalidName
       {
-        // = TITLE
-        // A name of length 0 is invalid.  Implementations may place
-        // further restrictions. 
       };
 
-      exception AlreadyBound 
+      /// Indicates that the specified name is already bound to
+      /// some object.  Only one object can be bound to a
+      /// particular name in an context.  To change the binding,
+      /// <rebind> and <rebind_context> can be used.
+      exception AlreadyBound
       {
-        // = TITLE
-        // Indicates that the specified name is already bound to
-        // some object.  Only one object can be bound to a
-        // particular name in an context.  To change the binding,
-        // <rebind> and <rebind_context> can be used.
       };
 
-      exception NotEmpty 
+      /// Indicates that the context is not empty.
+      exception NotEmpty
       {
-        // = TITLE
-        // Indicates that the context is not empty.
       };
 
       // = Binding operations.
 
+      /// Create a binding for name <n> and object <obj> in the naming
+      /// context.  Compound names are treated as follows: ctx->bind
+      /// (<c1; c2; c3; cn>, obj) = (ctx->resolve (<c1; c2;
+      /// cn-1>))->bind (<cn>, obj) if the there already exists a
+      /// binding for the specified name, <AlreadyBound> exception is
+      /// thrown.  Naming contexts should be bound using <bind_context>
+      /// and <rebind_context> in order to participate in name
+      /// resolution later.
       void bind (in Name n, in Object obj)
 	      raises (NotFound, CannotProceed, InvalidName, AlreadyBound);
-      // Create a binding for name <n> and object <obj> in the naming
-      // context.  Compound names are treated as follows: ctx->bind
-      // (<c1; c2; c3; cn>, obj) = (ctx->resolve (<c1; c2;
-      // cn-1>))->bind (<cn>, obj) if the there already exists a
-      // binding for the specified name, <AlreadyBound> exception is
-      // thrown.  Naming contexts should be bound using <bind_context>
-      // and <rebind_context> in order to participate in name
-      // resolution later.
 
+      /// This is similar to <bind> operation above, except for when
+      /// the binding for the specified name already exists in the
+      /// specified context.  In that case, the existing binding is
+      /// replaced with the new one.
       void rebind (in Name n, in Object obj)
 	      raises (NotFound, CannotProceed, InvalidName);
-      // This is similar to <bind> operation above, except for when
-      // the binding for the specified name already exists in the
-      // specified context.  In that case, the existing binding is
-      // replaced with the new one.
 
+      /// This is the version of <bind> specifically for binding naming
+      /// contexts, so that they will participate in name resolution
+      /// when compound names are passed to be resolved.
       void bind_context (in Name n, in NamingContext nc)
 	      raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-      // This is the version of <bind> specifically for binding naming
-      // contexts, so that they will participate in name resolution
-      // when compound names are passed to be resolved.
 
+      /// This is a version of <rebind> specifically for naming
+      /// contexts, so that they can participate in name resolution
+      /// when compound names are passed.
       void rebind_context (in Name n, in NamingContext nc)
 	      raises (NotFound, CannotProceed, InvalidName);
-      // This is a version of <rebind> specifically for naming
-      // contexts, so that they can participate in name resolution
-      // when compound names are passed.
 
       // = Resolving names.
 
+      /// Return object reference that is bound to the name.  Compound
+      /// name resolve is defined as follows: ctx->resolve (<c1; c2;
+      /// cn>) = ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The
+      /// naming service does not return the type of the object.
+      /// Clients are responsible for "narrowing" the object to the
+      /// appropriate type.
       Object resolve (in Name n)
 	      raises (NotFound, CannotProceed, InvalidName);
-      // Return object reference that is bound to the name.  Compound
-      // name resolve is defined as follows: ctx->resolve (<c1; c2;
-      // cn>) = ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The
-      // naming service does not return the type of the object.
-      // Clients are responsible for "narrowing" the object to the
-      // appropriate type.
 
       // = Unbinding names.
 
+      /// Remove the name binding from the context.  When compound
+      /// names are used, unbind is defined as follows: ctx->unbind
+      /// (<c1; c2; cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind
+      /// (<cn>)
       void unbind (in Name n)
 	      raises (NotFound, CannotProceed, InvalidName);
-      // Remove the name binding from the context.  When compound
-      // names are used, unbind is defined as follows: ctx->unbind
-      // (<c1; c2; cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind
-      // (<cn>)
 
       // = Creating Naming Contexts.
 
+      /// This operation returns a new naming context implemented by
+      /// the same naming server in which the operation was invoked.
+      /// The context is not bound.
       NamingContext new_context ();
-      // This operation returns a new naming context implemented by
-      // the same naming server in which the operation was invoked.
-      // The context is not bound.
 
+      /// This operation creates a new context and binds it to the name
+      /// supplied as an argument.  The newly-created context is
+      /// implemented by the same server as the context in which it was
+      /// bound (the name argument excluding the last component).
       NamingContext bind_new_context (in Name n)
 	      raises (NotFound, AlreadyBound, CannotProceed, InvalidName);
-      // This operation creates a new context and binds it to the name
-      // supplied as an argument.  The newly-created context is
-      // implemented by the same server as the context in which it was
-      // bound (the name argument excluding the last component).
 
       // = Deleting contexts.
 
+      /// Delete the naming context.  NOTE: the user should <unbind>
+      /// any bindings in which the given context is bound to some
+      /// names before invoking <destroy> operation on it.
       void destroy ()
 	      raises (NotEmpty);
-      // Delete the naming context.  NOTE: the user should <unbind>
-      // any bindings in which the given context is bound to some
-      // names before invoking <destroy> operation on it. 
-      
+
 
       // = Listing the naming context.
 
+      /// Returns at most the requested number of bindings <how_many>
+      /// in <bl>.  If the naming context contains additional bindings,
+      /// they are returned with a BindingIterator.  In the naming
+      /// context does not contain any additional bindings <bi>
+      /// returned as null.
       void list (in unsigned long how_many,
-		             out BindingList bl,
+                 out BindingList bl,
                  out BindingIterator bi);
-      // Returns at most the requested number of bindings <how_many>
-      // in <bl>.  If the naming context contains additional bindings,
-      // they are returned with a BindingIterator.  In the naming
-      // context does not contain any additional bindings <bi>
-      // returned as null.
     };
 
+  /// Interface for iterating over Bindings returned with the
+  /// <list> operation.
   interface BindingIterator
     {
-      // = TITLE
-      // Interface for iterating over Bindings returned with the
-      // <list> operation.
-
+      /// This operation returns the next binding.  If there are no
+      /// more bindings false is returned.
       boolean next_one (out Binding b);
-      // This operation returns the next binding.  If there are no
-      // more bindings false is returned.
 
+      /// This operation returns at most the requested number of
+      /// bindings.
       boolean next_n (in unsigned long how_many,
 		                  out BindingList bl);
-      // This operation returns at most the requested number of
-      // bindings.
 
+      /// This operation destroys the iterator.
       void destroy ();
-      // This operation destroys the iterator.
     };
 
-  interface NamingContextExt : NamingContext 
+  /// Interface for providing operations required to use URLs and
+  /// stringified names.
+  ///
+  /// Reference to: Document orbos/98-10-11 (Interoperable Naming Joint Revised Submission)
+  /// Joint Submission by BEA Systems, DSTC, IONA, and Inprise
+  interface NamingContextExt : NamingContext
     {
-      // = TITLE
-      // Interface for providing operations required to use URLs and
-      // stringified names.
-      //
-      // Reference to: Document orbos/98-10-11 (Interoperable Naming Joint Revised Submission)
-      // Joint Submission by BEA Systems, DSTC, IONA, and Inprise
-
+      /// Stringified form of a Name.
       typedef string StringName;
-      // Stringified form of a Name.
-      
+
+      /// URL<address> such as myhost.xyz.com.
       typedef string Address;
-      // URL<address> such as myhost.xyz.com.
-      
+
+      /// Stringified form of a URL<address> componoent.
       typedef string URLString;
-      // Stringified form of a URL<address> componoent.
-      
+
+      /// This operation accepts a Name and returns a stringified
+      /// name. If the name is invalid, an InvalidName exception is
+      /// raised.
       StringName to_string (in Name n)
         raises (InvalidName);
-      // This operation accepts a Name and returns a stringified
-      // name. If the name is invalid, an InvalidName exception is
-      // raised.
-      
+
+      /// This operation returns a Name. If the input stringified
+      /// name is syntactically malformed or violates an
+      /// implementation limit, an InvalidName exception is
+      /// raised.
       Name to_name (in StringName sn)
         raises (InvalidName);
-      // This operation returns a Name. If the input stringified
-      // name is syntactically malformed or violates an
-      // implementation limit, an InvalidName exception is
-      // raised.
 
+      /// Indicates that the URL<address> is invalid.
       exception InvalidAddress {
-        // = TITLE
-        // Indicates that the URL<address> is invalid.
       };
-      
-      URLString to_url (in Address addr, 
+
+      /// It performs any escapes necessary on the stringified name
+      /// and returns a fully formed URL string. An exception is
+      /// raised if either the protocol or name parameters are invalid.
+      URLString to_url (in Address addr,
                         in StringName sn)
         raises (InvalidAddress, InvalidName);
-      //
-      // It performs any escapes necessary on the stringified name
-      // and returns a fully formed URL string. An exception is
-      // raised if either the protocol or name parameters are invalid.
-      
-      
+
+      /// This is similar to <resolve> as in the
+      /// CosNaming::NamingContext interface, except that it accepts
+      /// a stringified name as an argument instead of a Name.
       Object resolve_str (in StringName n)
         raises (NotFound, CannotProceed, InvalidName);
-      //
-      // This is similar to <resolve> as in the
-      // CosNaming::NamingContext interface, except that it accepts
-      // a stringified name as an argument instead of a Name.
-      
     };
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index d70b23fa4f1..8898f4ff5c3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -41,7 +41,7 @@ TAO_LB_ObjectReferenceFactory::TAO_LB_ObjectReferenceFactory (
   this->location_.length (1);
   this->location_[0].id = CORBA::string_dup (location);
 
-  const CORBA::ULong len = repository_ids.length ();
+  CORBA::ULong const len = repository_ids.length ();
   ACE_NEW (this->registered_members_,
            CORBA::Boolean[len]);
 
@@ -104,7 +104,7 @@ TAO_LB_ObjectReferenceFactory::make_object (
 
   CORBA::ULong index = 0;
 
-  const CORBA::Boolean found_group =
+  CORBA::Boolean const found_group =
     this->find_object_group (repository_id,
                              index,
                              object_group.out ()
@@ -180,7 +180,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
   ACE_ENV_ARG_DECL)
 {
   if (!this->load_managed_object (repository_id, index))
-    return 0;
+    return false;
 
   PortableGroup::ObjectGroup_var group;
   if (this->table_.find (repository_id, group) != 0)
@@ -211,7 +211,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const CORBA::ULong len = this->fcids_.size ();
+          CORBA::ULong const len = this->fcids_.size ();
           this->fcids_.size (len + 1); // Incremental growth.  Yuck!
           this->fcids_[len] = fcid;
         }
@@ -246,12 +246,12 @@ TAO_LB_ObjectReferenceFactory::load_managed_object (const char * repository_id,
 {
   // @todo Make this more efficient.
 
-  const CORBA::ULong len = this->repository_ids_.length ();
+  CORBA::ULong const len = this->repository_ids_.length ();
   for (i = 0; i < len; ++i)
     if (ACE_OS::strcmp (this->repository_ids_[i], repository_id) == 0)
-      return 1;
+      return true;
 
-  return 0;
+  return false;
 }