ChangeLogTag:Fri Mar 2 11:46:40 2001 Ossama Othman <ossama@uci.edu>

3 files changed, 210 insertions, 196 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a5e77f63e5e..5a784676fa3 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,14 @@
+Fri Mar  2 11:46:40 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tao/CodecFactory.cpp (create_codec):
+
+	  Fixed a "statement is unreachable" warning.
+
+	* tao/PortableInterceptorC.h (sync_scope):
+
+	  Hide the ClientRequestInfo::sync_scope() method declaration if
+	  CORBA Messaging support isn't enabled.
+
 Fri Mar  2 11:37:43 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tao/PortableInterceptor.cpp:
diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp
index f595e37db6e..9a4b57e4dfa 100644
--- a/TAO/tao/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory.cpp
@@ -60,7 +60,6 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc,
     default:
       ACE_THROW_RETURN (IOP::CodecFactory::UnknownEncoding (),
 			IOP::Codec::_nil ());
-      break;
 
     }
 
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 40701acc557..d5d92d38e32 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -66,7 +66,7 @@ TAO_NAMESPACE  PortableInterceptor
 
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -77,17 +77,17 @@ TAO_NAMESPACE  PortableInterceptor
   {
   public:
     Interceptor_var (void); // default constructor
-    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} 
+    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {}
     Interceptor_var (const Interceptor_var &); // copy constructor
     ~Interceptor_var (void); // destructor
-    
+
     Interceptor_var &operator= (Interceptor_ptr);
     Interceptor_var &operator= (const Interceptor_var &);
     Interceptor_ptr operator-> (void) const;
-    
+
     operator const Interceptor_ptr &() const;
     operator Interceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Interceptor_ptr in (void) const;
     Interceptor_ptr &inout (void);
     Interceptor_ptr &out (void);
@@ -120,7 +120,7 @@ TAO_NAMESPACE  PortableInterceptor
     operator Interceptor_ptr &();
     Interceptor_ptr &ptr (void);
     Interceptor_ptr operator-> (void);
-    
+
   private:
     Interceptor_ptr &ptr_;
   };
@@ -144,12 +144,12 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     static Interceptor_ptr _duplicate (Interceptor_ptr obj);
     static Interceptor_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static Interceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static Interceptor_ptr _nil (void)
@@ -172,12 +172,12 @@ class TAO_Export Interceptor : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Interceptor ();
-    
+
     virtual ~Interceptor (void);
   private:
     Interceptor (const Interceptor &);
@@ -199,36 +199,36 @@ class TAO_Export Interceptor : public virtual CORBA_Object
 
     ForwardRequest (void);
     // Default constructor.
-    
+
     ForwardRequest (const ForwardRequest &);
     // Copy constructor.
-    
+
     ~ForwardRequest (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     ForwardRequest &operator= (const ForwardRequest &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
         CORBA::Environment &
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &,
         CORBA::Environment &
       );
-    
+
     static ForwardRequest *_downcast (CORBA::Exception *);
 
     ForwardRequest (
         const CORBA::Object_ptr  _tao_forward,
         CORBA::Boolean _tao_permanent
       );
-    
+
     // = TAO extension.
     static CORBA::Exception *_alloc (void);
     virtual CORBA::TypeCode_ptr _type (void) const;
@@ -269,29 +269,29 @@ class TAO_Export Interceptor : public virtual CORBA_Object
 
     InvalidSlot (void);
     // Default constructor.
-    
+
     InvalidSlot (const InvalidSlot &);
     // Copy constructor.
-    
+
     ~InvalidSlot (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     InvalidSlot &operator= (const InvalidSlot &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
         CORBA::Environment &
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &,
         CORBA::Environment &
       );
-    
+
     static InvalidSlot *_downcast (CORBA::Exception *);
 
 
@@ -311,7 +311,7 @@ class TAO_Export Interceptor : public virtual CORBA_Object
 
   class Current;
   typedef Current *Current_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -322,17 +322,17 @@ class TAO_Export Interceptor : public virtual CORBA_Object
   {
   public:
     Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {} 
+    Current_var (Current_ptr p) : ptr_ (p) {}
     Current_var (const Current_var &); // copy constructor
     ~Current_var (void); // destructor
-    
+
     Current_var &operator= (Current_ptr);
     Current_var &operator= (const Current_var &);
     Current_ptr operator-> (void) const;
-    
+
     operator const Current_ptr &() const;
     operator Current_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Current_ptr in (void) const;
     Current_ptr &inout (void);
     Current_ptr &out (void);
@@ -365,7 +365,7 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     operator Current_ptr &();
     Current_ptr &ptr (void);
     Current_ptr operator-> (void);
-    
+
   private:
     Current_ptr &ptr_;
   };
@@ -389,12 +389,12 @@ class TAO_Export Current: public virtual CORBA::Current
     static Current_ptr _duplicate (Current_ptr obj);
     static Current_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static Current_ptr _nil (void)
@@ -404,7 +404,7 @@ class TAO_Export Current: public virtual CORBA::Current
 
     virtual CORBA::Any * get_slot (
         PortableInterceptor::SlotId id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -415,7 +415,7 @@ class TAO_Export Current: public virtual CORBA::Current
     virtual void set_slot (
         PortableInterceptor::SlotId id,
         const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -424,12 +424,12 @@ class TAO_Export Current: public virtual CORBA::Current
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Current ();
-    
+
     virtual ~Current (void);
   private:
     Current (const Current &);
@@ -445,7 +445,7 @@ class TAO_Export Current: public virtual CORBA::Current
 
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -456,17 +456,17 @@ class TAO_Export Current: public virtual CORBA::Current
   {
   public:
     RequestInfo_var (void); // default constructor
-    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} 
+    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {}
     RequestInfo_var (const RequestInfo_var &); // copy constructor
     ~RequestInfo_var (void); // destructor
-    
+
     RequestInfo_var &operator= (RequestInfo_ptr);
     RequestInfo_var &operator= (const RequestInfo_var &);
     RequestInfo_ptr operator-> (void) const;
-    
+
     operator const RequestInfo_ptr &() const;
     operator RequestInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     RequestInfo_ptr in (void) const;
     RequestInfo_ptr &inout (void);
     RequestInfo_ptr &out (void);
@@ -499,7 +499,7 @@ class TAO_Export Current: public virtual CORBA::Current
     operator RequestInfo_ptr &();
     RequestInfo_ptr &ptr (void);
     RequestInfo_ptr operator-> (void);
-    
+
   private:
     RequestInfo_ptr &ptr_;
   };
@@ -523,12 +523,12 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
     static RequestInfo_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static RequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static RequestInfo_ptr _nil (void)
@@ -537,7 +537,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       }
 
     virtual CORBA::ULong request_id (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -545,7 +545,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual char * operation (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -553,7 +553,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -561,7 +561,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -569,7 +569,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual Dynamic::ContextList * contexts (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -577,7 +577,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual Dynamic::RequestContext * operation_context (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -585,7 +585,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -593,23 +593,27 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Boolean response_expected (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
+#if TAO_HAS_CORBA_MESSAGING == 1
+
     virtual Messaging::SyncScope sync_scope (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
+#endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
+
     virtual PortableInterceptor::ReplyStatus reply_status (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -617,7 +621,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Object_ptr forward_reference (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -626,7 +630,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
 
     virtual CORBA::Any * get_slot (
         PortableInterceptor::SlotId id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -636,7 +640,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
 
     virtual IOP::ServiceContext * get_request_service_context (
         IOP::ServiceId id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -645,7 +649,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
 
     virtual IOP::ServiceContext * get_reply_service_context (
         IOP::ServiceId id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -653,12 +657,12 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     RequestInfo ();
-    
+
     virtual ~RequestInfo (void);
   private:
     RequestInfo (const RequestInfo &);
@@ -674,7 +678,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
 
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -685,17 +689,17 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
   {
   public:
     ClientRequestInfo_var (void); // default constructor
-    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} 
+    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {}
     ClientRequestInfo_var (const ClientRequestInfo_var &); // copy constructor
     ~ClientRequestInfo_var (void); // destructor
-    
+
     ClientRequestInfo_var &operator= (ClientRequestInfo_ptr);
     ClientRequestInfo_var &operator= (const ClientRequestInfo_var &);
     ClientRequestInfo_ptr operator-> (void) const;
-    
+
     operator const ClientRequestInfo_ptr &() const;
     operator ClientRequestInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ClientRequestInfo_ptr in (void) const;
     ClientRequestInfo_ptr &inout (void);
     ClientRequestInfo_ptr &out (void);
@@ -728,7 +732,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
     operator ClientRequestInfo_ptr &();
     ClientRequestInfo_ptr &ptr (void);
     ClientRequestInfo_ptr operator-> (void);
-    
+
   private:
     ClientRequestInfo_ptr &ptr_;
   };
@@ -752,12 +756,12 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
     static ClientRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ClientRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ClientRequestInfo_ptr _nil (void)
@@ -766,7 +770,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       }
 
     virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -774,7 +778,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual CORBA::Object_ptr effective_target (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -782,7 +786,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual IOP::TaggedProfile * effective_profile (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -790,7 +794,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual CORBA::Any * received_exception (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -798,7 +802,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual char * received_exception_id (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -807,7 +811,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
 
     virtual IOP::TaggedComponent * get_effective_component (
         IOP::ComponentId id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -816,7 +820,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
 
     virtual IOP::TaggedComponentSeq * get_effective_components (
         IOP::ComponentId id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -825,7 +829,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
 
     virtual CORBA::Policy_ptr get_request_policy (
         CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -835,7 +839,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
     virtual void add_request_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -843,12 +847,12 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ClientRequestInfo ();
-    
+
     virtual ~ClientRequestInfo (void);
   private:
     ClientRequestInfo (const ClientRequestInfo &);
@@ -864,7 +868,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
 
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -875,17 +879,17 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
   {
   public:
     ServerRequestInfo_var (void); // default constructor
-    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} 
+    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {}
     ServerRequestInfo_var (const ServerRequestInfo_var &); // copy constructor
     ~ServerRequestInfo_var (void); // destructor
-    
+
     ServerRequestInfo_var &operator= (ServerRequestInfo_ptr);
     ServerRequestInfo_var &operator= (const ServerRequestInfo_var &);
     ServerRequestInfo_ptr operator-> (void) const;
-    
+
     operator const ServerRequestInfo_ptr &() const;
     operator ServerRequestInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ServerRequestInfo_ptr in (void) const;
     ServerRequestInfo_ptr &inout (void);
     ServerRequestInfo_ptr &out (void);
@@ -918,7 +922,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
     operator ServerRequestInfo_ptr &();
     ServerRequestInfo_ptr &ptr (void);
     ServerRequestInfo_ptr operator-> (void);
-    
+
   private:
     ServerRequestInfo_ptr &ptr_;
   };
@@ -942,12 +946,12 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
     static ServerRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ServerRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ServerRequestInfo_ptr _nil (void)
@@ -956,7 +960,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
       }
 
     virtual CORBA::Any * sending_exception (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -964,7 +968,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual CORBA::OctetSeq * object_id (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -972,7 +976,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual CORBA::OctetSeq * adapter_id (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -980,7 +984,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -989,7 +993,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
 
     virtual CORBA::Policy_ptr get_server_policy (
         CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -999,7 +1003,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     virtual void set_slot (
         PortableInterceptor::SlotId id,
         const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1009,7 +1013,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
 
     virtual CORBA::Boolean target_is_a (
         const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1019,7 +1023,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1027,12 +1031,12 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ServerRequestInfo ();
-    
+
     virtual ~ServerRequestInfo (void);
   private:
     ServerRequestInfo (const ServerRequestInfo &);
@@ -1048,7 +1052,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
 
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1059,17 +1063,17 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
   {
   public:
     ClientRequestInterceptor_var (void); // default constructor
-    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} 
+    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {}
     ClientRequestInterceptor_var (const ClientRequestInterceptor_var &); // copy constructor
     ~ClientRequestInterceptor_var (void); // destructor
-    
+
     ClientRequestInterceptor_var &operator= (ClientRequestInterceptor_ptr);
     ClientRequestInterceptor_var &operator= (const ClientRequestInterceptor_var &);
     ClientRequestInterceptor_ptr operator-> (void) const;
-    
+
     operator const ClientRequestInterceptor_ptr &() const;
     operator ClientRequestInterceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ClientRequestInterceptor_ptr in (void) const;
     ClientRequestInterceptor_ptr &inout (void);
     ClientRequestInterceptor_ptr &out (void);
@@ -1102,7 +1106,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     operator ClientRequestInterceptor_ptr &();
     ClientRequestInterceptor_ptr &ptr (void);
     ClientRequestInterceptor_ptr operator-> (void);
-    
+
   private:
     ClientRequestInterceptor_ptr &ptr_;
   };
@@ -1126,12 +1130,12 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
     static ClientRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ClientRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ClientRequestInterceptor_ptr _nil (void)
@@ -1183,12 +1187,12 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ClientRequestInterceptor ();
-    
+
     virtual ~ClientRequestInterceptor (void);
   private:
     ClientRequestInterceptor (const ClientRequestInterceptor &);
@@ -1204,7 +1208,7 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
 
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1215,17 +1219,17 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
   {
   public:
     ServerRequestInterceptor_var (void); // default constructor
-    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} 
+    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {}
     ServerRequestInterceptor_var (const ServerRequestInterceptor_var &); // copy constructor
     ~ServerRequestInterceptor_var (void); // destructor
-    
+
     ServerRequestInterceptor_var &operator= (ServerRequestInterceptor_ptr);
     ServerRequestInterceptor_var &operator= (const ServerRequestInterceptor_var &);
     ServerRequestInterceptor_ptr operator-> (void) const;
-    
+
     operator const ServerRequestInterceptor_ptr &() const;
     operator ServerRequestInterceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ServerRequestInterceptor_ptr in (void) const;
     ServerRequestInterceptor_ptr &inout (void);
     ServerRequestInterceptor_ptr &out (void);
@@ -1258,7 +1262,7 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     operator ServerRequestInterceptor_ptr &();
     ServerRequestInterceptor_ptr &ptr (void);
     ServerRequestInterceptor_ptr operator-> (void);
-    
+
   private:
     ServerRequestInterceptor_ptr &ptr_;
   };
@@ -1282,12 +1286,12 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
     static ServerRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ServerRequestInterceptor_ptr _nil (void)
@@ -1340,12 +1344,12 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ServerRequestInterceptor ();
-    
+
     virtual ~ServerRequestInterceptor (void);
   private:
     ServerRequestInterceptor (const ServerRequestInterceptor &);
@@ -1361,7 +1365,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
 
   class IORInfo;
   typedef IORInfo *IORInfo_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1372,17 +1376,17 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
   {
   public:
     IORInfo_var (void); // default constructor
-    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} 
+    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {}
     IORInfo_var (const IORInfo_var &); // copy constructor
     ~IORInfo_var (void); // destructor
-    
+
     IORInfo_var &operator= (IORInfo_ptr);
     IORInfo_var &operator= (const IORInfo_var &);
     IORInfo_ptr operator-> (void) const;
-    
+
     operator const IORInfo_ptr &() const;
     operator IORInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     IORInfo_ptr in (void) const;
     IORInfo_ptr &inout (void);
     IORInfo_ptr &out (void);
@@ -1415,7 +1419,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     operator IORInfo_ptr &();
     IORInfo_ptr &ptr (void);
     IORInfo_ptr operator-> (void);
-    
+
   private:
     IORInfo_ptr &ptr_;
   };
@@ -1439,12 +1443,12 @@ class TAO_Export IORInfo : public virtual CORBA_Object
     static IORInfo_ptr _duplicate (IORInfo_ptr obj);
     static IORInfo_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static IORInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static IORInfo_ptr _nil (void)
@@ -1454,7 +1458,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
 
     virtual CORBA::Policy_ptr get_effective_policy (
         CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1463,7 +1467,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
 
     virtual void add_ior_component (
         const IOP::TaggedComponent & component,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1473,7 +1477,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
     virtual void add_ior_component_to_profile (
         const IOP::TaggedComponent & component,
         IOP::ProfileId profile_id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1481,12 +1485,12 @@ class TAO_Export IORInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     IORInfo ();
-    
+
     virtual ~IORInfo (void);
   private:
     IORInfo (const IORInfo &);
@@ -1502,7 +1506,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
 
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1513,17 +1517,17 @@ class TAO_Export IORInfo : public virtual CORBA_Object
   {
   public:
     IORInterceptor_var (void); // default constructor
-    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} 
+    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {}
     IORInterceptor_var (const IORInterceptor_var &); // copy constructor
     ~IORInterceptor_var (void); // destructor
-    
+
     IORInterceptor_var &operator= (IORInterceptor_ptr);
     IORInterceptor_var &operator= (const IORInterceptor_var &);
     IORInterceptor_ptr operator-> (void) const;
-    
+
     operator const IORInterceptor_ptr &() const;
     operator IORInterceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     IORInterceptor_ptr in (void) const;
     IORInterceptor_ptr &inout (void);
     IORInterceptor_ptr &out (void);
@@ -1556,7 +1560,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
     operator IORInterceptor_ptr &();
     IORInterceptor_ptr &ptr (void);
     IORInterceptor_ptr operator-> (void);
-    
+
   private:
     IORInterceptor_ptr &ptr_;
   };
@@ -1580,12 +1584,12 @@ class TAO_Export IORInterceptor: public virtual Interceptor
     static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
     static IORInterceptor_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static IORInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static IORInterceptor_ptr _nil (void)
@@ -1602,12 +1606,12 @@ class TAO_Export IORInterceptor: public virtual Interceptor
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     IORInterceptor ();
-    
+
     virtual ~IORInterceptor (void);
   private:
     IORInterceptor (const IORInterceptor &);
@@ -1623,7 +1627,7 @@ class TAO_Export IORInterceptor: public virtual Interceptor
 
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1634,17 +1638,17 @@ class TAO_Export IORInterceptor: public virtual Interceptor
   {
   public:
     PolicyFactory_var (void); // default constructor
-    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} 
+    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {}
     PolicyFactory_var (const PolicyFactory_var &); // copy constructor
     ~PolicyFactory_var (void); // destructor
-    
+
     PolicyFactory_var &operator= (PolicyFactory_ptr);
     PolicyFactory_var &operator= (const PolicyFactory_var &);
     PolicyFactory_ptr operator-> (void) const;
-    
+
     operator const PolicyFactory_ptr &() const;
     operator PolicyFactory_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     PolicyFactory_ptr in (void) const;
     PolicyFactory_ptr &inout (void);
     PolicyFactory_ptr &out (void);
@@ -1677,7 +1681,7 @@ class TAO_Export IORInterceptor: public virtual Interceptor
     operator PolicyFactory_ptr &();
     PolicyFactory_ptr &ptr (void);
     PolicyFactory_ptr operator-> (void);
-    
+
   private:
     PolicyFactory_ptr &ptr_;
   };
@@ -1701,12 +1705,12 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
     static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
     static PolicyFactory_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static PolicyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static PolicyFactory_ptr _nil (void)
@@ -1725,12 +1729,12 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     PolicyFactory ();
-    
+
     virtual ~PolicyFactory (void);
   private:
     PolicyFactory (const PolicyFactory &);
@@ -1746,7 +1750,7 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
 
   class ORBInitInfo;
   typedef ORBInitInfo *ORBInitInfo_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1757,17 +1761,17 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
   {
   public:
     ORBInitInfo_var (void); // default constructor
-    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} 
+    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {}
     ORBInitInfo_var (const ORBInitInfo_var &); // copy constructor
     ~ORBInitInfo_var (void); // destructor
-    
+
     ORBInitInfo_var &operator= (ORBInitInfo_ptr);
     ORBInitInfo_var &operator= (const ORBInitInfo_var &);
     ORBInitInfo_ptr operator-> (void) const;
-    
+
     operator const ORBInitInfo_ptr &() const;
     operator ORBInitInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ORBInitInfo_ptr in (void) const;
     ORBInitInfo_ptr &inout (void);
     ORBInitInfo_ptr &out (void);
@@ -1800,7 +1804,7 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
     operator ORBInitInfo_ptr &();
     ORBInitInfo_ptr &ptr (void);
     ORBInitInfo_ptr operator-> (void);
-    
+
   private:
     ORBInitInfo_ptr &ptr_;
   };
@@ -1824,12 +1828,12 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
     static ORBInitInfo_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ORBInitInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ORBInitInfo_ptr _nil (void)
@@ -1840,7 +1844,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     typedef char * ObjectId;
     typedef CORBA::String_var ObjectId_var;
     typedef CORBA::String_out ObjectId_out;
-    
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
 
@@ -1851,33 +1855,33 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 
       DuplicateName (void);
       // Default constructor.
-      
+
       DuplicateName (const DuplicateName &);
       // Copy constructor.
-      
+
       ~DuplicateName (void);
       // Destructor.
-      
+
       DuplicateName &operator= (const DuplicateName &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
           TAO_OutputCDR &,
           CORBA::Environment &
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &,
           CORBA::Environment &
         );
-      
+
       static DuplicateName *_downcast (CORBA::Exception *);
 
       DuplicateName (
           const char * _tao_name
         );
-      
+
       // = TAO extension.
       static CORBA::Exception *_alloc (void);
     }; // Exception PortableInterceptor::ORBInitInfo::DuplicateName.
@@ -1895,27 +1899,27 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 
       InvalidName (void);
       // Default constructor.
-      
+
       InvalidName (const InvalidName &);
       // Copy constructor.
-      
+
       ~InvalidName (void);
       // Destructor.
-      
+
       InvalidName &operator= (const InvalidName &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
           TAO_OutputCDR &,
           CORBA::Environment &
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &,
           CORBA::Environment &
         );
-      
+
       static InvalidName *_downcast (CORBA::Exception *);
 
 
@@ -1927,7 +1931,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     virtual CORBA::StringSeq * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1935,7 +1939,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual char * orb_id (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1943,7 +1947,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual IOP::CodecFactory_ptr codec_factory (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1953,7 +1957,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     virtual void register_initial_reference (
         const char * id,
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1963,7 +1967,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr resolve_initial_references (
         const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1973,7 +1977,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 
     virtual void add_client_request_interceptor (
         PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1983,7 +1987,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 
     virtual void add_server_request_interceptor (
         PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1993,7 +1997,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 
     virtual void add_ior_interceptor (
         PortableInterceptor::IORInterceptor_ptr interceptor,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -2002,7 +2006,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual PortableInterceptor::SlotId allocate_slot_id (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -2012,7 +2016,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     virtual void register_policy_factory (
         CORBA::PolicyType type,
         PortableInterceptor::PolicyFactory_ptr policy_factory,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -2020,12 +2024,12 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ORBInitInfo ();
-    
+
     virtual ~ORBInitInfo (void);
   private:
     ORBInitInfo (const ORBInitInfo &);
@@ -2041,7 +2045,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 
   class ORBInitializer;
   typedef ORBInitializer *ORBInitializer_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -2052,17 +2056,17 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
   {
   public:
     ORBInitializer_var (void); // default constructor
-    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} 
+    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {}
     ORBInitializer_var (const ORBInitializer_var &); // copy constructor
     ~ORBInitializer_var (void); // destructor
-    
+
     ORBInitializer_var &operator= (ORBInitializer_ptr);
     ORBInitializer_var &operator= (const ORBInitializer_var &);
     ORBInitializer_ptr operator-> (void) const;
-    
+
     operator const ORBInitializer_ptr &() const;
     operator ORBInitializer_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ORBInitializer_ptr in (void) const;
     ORBInitializer_ptr &inout (void);
     ORBInitializer_ptr &out (void);
@@ -2095,7 +2099,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     operator ORBInitializer_ptr &();
     ORBInitializer_ptr &ptr (void);
     ORBInitializer_ptr operator-> (void);
-    
+
   private:
     ORBInitializer_ptr &ptr_;
   };
@@ -2119,12 +2123,12 @@ class TAO_Export ORBInitializer : public virtual CORBA_Object
     static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
     static ORBInitializer_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ORBInitializer_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static ORBInitializer_ptr _nil (void)
@@ -2149,12 +2153,12 @@ class TAO_Export ORBInitializer : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ORBInitializer ();
-    
+
     virtual ~ORBInitializer (void);
   private:
     ORBInitializer (const ORBInitializer &);