Removed the return value from make_profile(). This was a case

where an error return value was "competing" with native
exception handling.  It makes more sense to handle the exception
alone. Thanks to Carlos for talking this issue through with me.

Added a default value for the CORBA_Environment argument in
make_profile().

1 files changed, 4 insertions, 4 deletions

diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 8560f106798..f6285878d6e 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -85,10 +85,10 @@ public:
 
 protected:
   // = More TAO_Connector methods, please check the documentation on
-  // Pluggable.h
-  virtual int make_profile (const char *endpoint,
-                            TAO_Profile *&,
-                            CORBA::Environment &ACE_TRY_ENV);
+  //   Pluggable.h
+  virtual void make_profile (const char *endpoint,
+                             TAO_Profile *&,
+                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   virtual int check_prefix (const char *endpoint);