This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

1 files changed, 7 insertions, 22 deletions

diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 2dadf94bb98..482ce0a9f18 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -23,7 +23,7 @@
 
 #include "ace/CORBA_macros.h"
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 class TAO_Stub;
 class TAO_Profile;
@@ -34,6 +34,7 @@ class TAO_Transport_Descriptor_Interface;
 
 namespace CORBA
 {
+  class SystemException;
   class Environment;
   class Object;
   class PolicyList;
@@ -57,22 +58,13 @@ namespace TAO
    * object. This class helps in choosing the right profile, and pick
    * a transport from cache (or create a new transport if needed) that
    * represents the profile.
+   *
    */
   class TAO_Export Profile_Transport_Resolver
   {
   public:
-    /// Constructor
-    /**
-     * With @a block we tell whether this resolved should always deliver
-     * a connection by blocking or unblock before the connection is
-     * completely established. Please note that this has *nothing* to
-     * do with the synchronous or asynch connect strategy used for
-     * making connections. This is a local flag used by the clients of
-     * this to dictate some local behavior.
-     */
-    Profile_Transport_Resolver (CORBA::Object *p,
-                                TAO_Stub *stub,
-                                bool block = true);
+    Profile_Transport_Resolver (CORBA::Object *ep,
+                                TAO_Stub *);
 
     ~Profile_Transport_Resolver (void);
 
@@ -87,11 +79,11 @@ namespace TAO
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+
     //@{
     /**
      * Accessors and mutators for this class. The following methods
-     * are used by the clients of this class to access strategies and
-     * other internal workings.
+     * are used by the clients of this class to access.
      */
 
     /// Mutator for profile.
@@ -108,10 +100,6 @@ namespace TAO
 
     /// Accessor for the transport reserved for this invocation.
     TAO_Transport *transport (void) const;
-
-    /// Accessor to indicate whether we should deliver a connection
-    /// blocking for completed connections
-    bool blocked (void) const;
     //@}
 
     /// Signal to let the resolver know that the transport has been
@@ -175,9 +163,6 @@ namespace TAO
      * avoid.
      */
     CORBA::PolicyList *inconsistent_policies_;
-
-    /// Should we block while trying to make a connection
-    const bool blocked_;
   };
 } // TAO namespace end