ChangeLogTag:Sun Mar 04 23:00:59 2001 Ossama Othman <ossama@uci.edu>

2 files changed, 24 insertions, 25 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index fb9f4190bb3..faf9056ec8f 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Sun Mar 04 23:00:59 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tao/ORB.h (run):
+
+	  Updated comments for the ORB::run() method.  This method, as
+	  implemented by TAO, no longer returns an "int" error status (see
+	  Carlos' ChangeLog entry from Feb 13).  The CORBA spec calls for
+	  a "void" return type.
+
 Sun Mar 04 21:43:51 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * orbsvcs/CosEvent_Service/Makefile:
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 10146675c14..b79362babc0 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -1,5 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -7,31 +6,30 @@
  *
  *  $Id$
  *
- *   Header file for CORBA's <ORB> type and type.
- *
+ *  Header file for CORBA's ORB type.
  *
  *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
  *  @author Douglas C. Schmidt <schmidt@uci.edu>
  */
 //=============================================================================
 
-
 #ifndef TAO_ORB_H
 #define TAO_ORB_H
+
 #include "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Exception.h"
-#include "tao/Services.h"
-#include "tao/CORBA_String.h"
+#include "Exception.h"
+#include "Services.h"
+#include "CORBA_String.h"
 
 // IRIX needs this for the throw specs
-#include "tao/PolicyC.h"
+#include "PolicyC.h"
 
 typedef enum
 {
@@ -41,7 +39,7 @@ typedef enum
   TAO_SERVICEID_INTERFACEREPOSERVICE
 } TAO_Service_ID;
 
-// = Forward declarations.
+/// Forward declarations.
 class TAO_MProfile;
 struct TAO_Dispatch_Context;
 class TAO_Client_Strategy_Factory;
@@ -219,20 +217,16 @@ public:
   /**
    * Instructs the ORB to initialize itself and run its event loop in
    * the current thread, not returning until the ORB has shut down.
-   * If an error occurs during initialization or a run-time this
-   * method will return -1.
+   * If an error occurs during initialization or at run-time, a CORBA
+   * system exception will be thrown.
    */
   void run (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   /**
    * Instructs the ORB to initialize itself and run its event loop in
    * the current thread, not returning until the ORB has shut down.
-   * If an error occurs during initialization or a run-time this
-   * method will return -1.  If no requests arrive at this thread
-   * before the <tv> "relative" timeout elapses we return to the
-   * caller with a value of 0 (this allows timeouts).  Otherwise, if
-   * we've returned since we've been asked to shut down the value of 1
-   * is returned.
+   * If an error occurs during initialization or at run-time, a CORBA
+   * system exception will be thrown.
    */
   void run (ACE_Time_Value &tv,
             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
@@ -240,12 +234,8 @@ public:
   /**
    * Instructs the ORB to initialize itself and run its event loop in
    * the current thread, not returning until the ORB has shut down.
-   * If an error occurs during initialization or a run-time this
-   * method will return -1.  If <tv> is non-NULL, then if no requests
-   * arrive at this thread before the "relative" timeout elapses we
-   * return to the caller with a value of 0 (this allows timeouts).
-   * Otherwise, if we've returned since we've been asked to shut down
-   * the value of 1 is returned.
+   * If an error occurs during initialization or at run-time, a CORBA
+   * system exception will be thrown.
    */
   void run (ACE_Time_Value *tv,
             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());