ChangeLogTag:Sun Sep 5 01:13:12 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

17 files changed, 380 insertions, 485 deletions

diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index 7f836fd3000..a1d64942028 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -1,13 +1,18 @@
-// -*- C++ -*-
+// $Id$
+
 #include "ClientRequestInfo.h"
-ACE_RCSID (TAO,
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+
+ACE_RCSID (tao,
            ClientRequestInfo,
            "$Id$")
 
-#if TAO_HAS_INTERCEPTORS == 1
 
 #include "ClientRequestInfo_i.h"
 #include "Any.h"
+#include "PolicyC.h"
 
 # if !defined (__ACE_INLINE__)
 #   include "ClientRequestInfo.inl"
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 88902f9be16..b8de495cfc7 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -13,6 +13,7 @@ ACE_RCSID (DynamicInterface,
 #include "tao/Marshal.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl.h"
+#include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Server_Request.inl"
@@ -244,4 +245,3 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception)
 # pragma instantiate TAO_Pseudo_Out_T<CORBA::ServerRequest, CORBA::ServerRequest_var>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index 197bc1275c1..d0ba65b8959 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -3,6 +3,7 @@
 #include "FILE_Parser.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
+#include "tao/Object.h"
 
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 19efaeb09b6..c3b3131d9d1 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -471,7 +471,6 @@ CORBA::ORB::create_struct_tc (
     const CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -498,7 +497,6 @@ CORBA::ORB::create_union_tc (
     const CORBA::UnionMemberSeq & members
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -525,7 +523,6 @@ CORBA::ORB::create_enum_tc (
     const CORBA::EnumMemberSeq & members
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -551,7 +548,6 @@ CORBA::ORB::create_alias_tc (
     CORBA::TypeCode_ptr original_type
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -577,7 +573,6 @@ CORBA::ORB::create_exception_tc (
     const CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -602,7 +597,6 @@ CORBA::ORB::create_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -625,7 +619,6 @@ CORBA::ORB::create_string_tc (
     CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -647,7 +640,6 @@ CORBA::ORB::create_wstring_tc (
     CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -670,7 +662,6 @@ CORBA::ORB::create_fixed_tc (
     CORBA::UShort scale
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -694,7 +685,6 @@ CORBA::ORB::create_sequence_tc (
     CORBA::TypeCode_ptr element_type
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -718,7 +708,6 @@ CORBA::ORB::create_array_tc (
     CORBA::TypeCode_ptr element_type
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -745,7 +734,6 @@ CORBA::ORB::create_value_tc (
     const CORBA::ValueMemberSeq & members
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -773,7 +761,6 @@ CORBA::ORB::create_value_box_tc (
     CORBA::TypeCode_ptr boxed_type
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -798,7 +785,6 @@ CORBA::ORB::create_native_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -821,7 +807,6 @@ CORBA::ORB::create_recursive_tc (
     const char *id
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -844,7 +829,6 @@ CORBA::ORB::create_abstract_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -868,7 +852,6 @@ CORBA::ORB::create_local_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -892,7 +875,6 @@ CORBA::ORB::create_component_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -916,7 +898,6 @@ CORBA::ORB::create_home_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -943,7 +924,6 @@ CORBA::ORB::create_event_tc (
     const CORBA::ValueMemberSeq &members
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -1318,17 +1298,6 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
   TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-#if defined (ACE_HAS_EXCEPTIONS)
-  // This must be done after the system TypeCodes and Exceptions have
-  // been initialized.  An unexpected exception will cause TAO's
-  // unexpected exception handler to be called.  That handler
-  // transforms all unexpected exceptions to CORBA::UNKNOWN, which of
-  // course requires the TypeCode constants and system exceptions to
-  // have been initialized.
-  TAO_Singleton_Manager::instance ()->_set_unexpected (
-    CORBA::ORB::_tao_unexpected_exception);
-#endif /* ACE_HAS_EXCEPTIONS */
-
   // Verify some of the basic implementation requirements.  This test
   // gets optimized away by a decent compiler (or else the rest of the
   // routine does).
@@ -1407,16 +1376,6 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
-void CORBA::ORB::_tao_unexpected_exception (void)
-{
-#if defined(ACE_HAS_EXCEPTIONS)
-  throw CORBA::UNKNOWN ();
-#else
-  // Nothing to do, this will be handled by the ORB core when sending
-  // the exception back to the client...
-#endif /* ACE_HAS_EXCEPTIONS */
-}
-
 const ACE_CString &
 CORBA::ORB::_tao_ft_client_id (void)
 {
@@ -1892,8 +1851,6 @@ CORBA::Policy_ptr
 CORBA::ORB::create_policy (CORBA::PolicyType type,
                            const CORBA::Any& val
                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
   this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -1909,8 +1866,6 @@ CORBA::ORB::create_policy (CORBA::PolicyType type,
 CORBA::Policy_ptr
 CORBA::ORB::_create_policy (CORBA::PolicyType type
                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
 {
   this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 9a1621ca7c1..325afa29502 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -18,17 +18,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SystemException.h"
+#include "UserException.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "UserException.h"
 #include "objectid.h"
-#include "PolicyC.h"
+#include "Policy_ForwardC.h"
 #include "OBV_Constants.h"
 #include "CORBA_methods.h"
+#include "VarOut_T.h"
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
@@ -63,6 +63,15 @@ namespace CORBA
   class ValueMemberSeq;
   class ORB_ObjectIdList;
 
+  class ExceptionList;
+  typedef ExceptionList * ExceptionList_ptr;
+
+  class ContextList;
+  typedef ContextList * ContextList_ptr;
+
+  class Context;
+  typedef Context * Context_ptr;
+
   // Used at present only in Typecode_Constants.cpp, to make _tc_ORBid.
   // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
   typedef char * ORBid;
@@ -114,11 +123,12 @@ namespace CORBA
   typedef UShort ServiceType;
 
   class Request;
+  typedef Request * Request_ptr;
   typedef TAO_Pseudo_Var_T<Request> Request_var;
   typedef TAO_Pseudo_Out_T<Request, Request_var> Request_out;
 
   class ORB;
-  typedef ORB *ORB_ptr;
+  typedef ORB * ORB_ptr;
   typedef TAO_Pseudo_Var_T<ORB> ORB_var;
   typedef TAO_Pseudo_Out_T<ORB, ORB_var> ORB_out;
 
@@ -198,7 +208,7 @@ namespace CORBA
      * Turn an object reference into a string.  Each type of ORB,
      * e.g. an IIOP ORB, must implement this.  This can be used by
      * servers to publish their whereabouts to clients.  The output of
-     * this is typically eventually given to <string_to_object()> as
+     * this is typically eventually given to @c string_to_object() as
      * an argument.
      */
     char * object_to_string (CORBA::Object_ptr obj
@@ -293,71 +303,60 @@ namespace CORBA
         const char *id,
         const char *name,
         const CORBA::StructMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_union_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr discriminator_type,
         const CORBA::UnionMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_enum_tc (
         const char *id,
         const char *name,
         const CORBA::EnumMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_alias_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_exception_tc (
         const char *id,
         const char *name,
         const CORBA::StructMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_interface_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_string_tc (
         CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_wstring_tc (
         CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_fixed_tc (
         CORBA::UShort digits,
         CORBA::UShort scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_sequence_tc (
         CORBA::ULong bound,
         CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_array_tc (
         CORBA::ULong length,
         CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_value_tc (
         const char *id,
@@ -365,52 +364,43 @@ namespace CORBA
         CORBA::ValueModifier type_modifier,
         CORBA::TypeCode_ptr concrete_base,
         const CORBA::ValueMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_value_box_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr boxed_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_native_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_recursive_tc (
         const char *id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_local_interface_tc (
         const char *id,
         const char *ame
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_component_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr create_home_tc (
         const char *id,
         const char *name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        );
 
     CORBA::TypeCode_ptr create_event_tc (
         const char *id,
@@ -418,9 +408,7 @@ namespace CORBA
         CORBA::ValueModifier type_modifier,
         CORBA::TypeCode_ptr concrete_base,
         const CORBA::ValueMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -437,12 +425,12 @@ namespace CORBA
     /**
      * Instructs the ORB to initialize itself and run its event loop in
      * the current thread, not returning until the ORB has shut down or
-     * the time value specified through <tv> has expired.  If an error
-     * occurs during initialization or at runtime, a CORBA system
-     * exception will be thrown.  <tv> is reduced by the amount of time
-     * spent in this call.
+     * the time value specified through @a tv has expired.  If an
+     * error occurs during initialization or at runtime, a CORBA
+     * system exception will be thrown.  @a tv is reduced by the
+     * amount of time spent in this call.
      *
-     * If this function is called with  <tv> value, client threads
+     * If this function is called with a @ tv value, client threads
      * making invocations will continue their operations. When the
      * operation timesout and returns, any invocations showing up on
      * the server will be buffered by TCP.
@@ -453,14 +441,14 @@ namespace CORBA
     /**
      * Instructs the ORB to initialize itself and run its event loop in
      * the current thread, not returning until the ORB has shut down or
-     * the time value specified through <tv> has expired.  If an error
+     * the time value specified through @a tv has expired.  If an error
      * occurs during initialization or at runtime, a CORBA system
-     * exception will be thrown.  <tv> is reduced by the amount of time
-     * spent in this call.  If <tv> is 0, it means that the timeout is
-     * infinite.  If <tv> is ACE_Time_Value::zero, it specifies to poll
-     * and does not block.
+     * exception will be thrown.  @a tv is reduced by the amount of time
+     * spent in this call.  If @a tv is 0, it means that the timeout
+     * is infinite.  If @a tv is @c ACE_Time_Value::zero, it specifies
+     * to poll and does not block.
      *
-     * If this function is called with  <tv> value, client threads
+     * If this function is called with @a tv value, client threads
      * making invocations will continue their operations. When the
      * operation timesout and returns, any invocations showing up on
      * the server will be buffered by TCP.
@@ -557,9 +545,7 @@ namespace CORBA
 
     CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                      const CORBA::Any& val
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CORBA::PolicyError));
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     // ----------------------------------------------------------------
     // = TAO-specific extensions to the CORBA specification.
@@ -568,9 +554,7 @@ namespace CORBA
     /// Create an empty policy, usually to be filled in later by
     /// demarshaling.
     CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                      ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CORBA::PolicyError));
+                                      ACE_ENV_ARG_DECL);
 
     /// Resolve the POA.
     CORBA::Object_ptr resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL);
@@ -579,10 +563,6 @@ namespace CORBA
     /// haven't been initialized yet.
     static void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL);
 
-    // The function used by tao to handle the "unexpected" exceptions,
-    // It raises CORBA::UNKNOWN.
-    static void _tao_unexpected_exception (void);
-
     // Reference counting...
     CORBA::ULong _incr_refcnt (void);
     CORBA::ULong _decr_refcnt (void);
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 44e308484bc..bb64bcd766e 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -18,6 +18,7 @@
 #include "Remote_Object_Proxy_Broker.h"
 #include "CDR.h"
 #include "SystemException.h"
+#include "PolicyC.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index cdaadc12f66..af00050eba3 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -4,12 +4,15 @@
 #include "debug.h"
 #include "ORB_Constants.h"
 #include "SystemException.h"
+#include "Object.h"
 #include "ace/OS_NS_string.h"
 
+
 ACE_RCSID (tao,
            Object_Ref_Table,
            "$Id$")
 
+
 // ****************************************************************
 
 TAO_Object_Ref_Table::TAO_Object_Ref_Table (void)
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
index 2c15ef39c40..2fc7b7da091 100644
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PolicyFactory_Registry.cpp
@@ -2,6 +2,8 @@
 #include "PortableInterceptorC.h"
 #include "ORB_Constants.h"
 #include "SystemException.h"
+#include "PolicyC.h"
+
 
 ACE_RCSID (tao,
            PolicyFactory_Registry,
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index bcd20a24149..7b515073623 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -32,6 +32,7 @@
 #include "PortableInterceptorC.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
+#include "tao/PolicyC.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index a7f56cf7b42..05d295f9757 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -47,6 +47,7 @@
 #include "tao/Messaging_SyncScopeC.h"
 #include "tao/IOP_CodecC.h"
 #include "tao/Policy_ForwardC.h"
+#include "tao/CurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index b5fffae55be..d0bb3877591 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -54,6 +54,7 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
+#include "tao/PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -1035,27 +1036,27 @@ namespace RTCORBA
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
+
   class TCPProtocolProperties;
   typedef TCPProtocolProperties *TCPProtocolProperties_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         TCPProtocolProperties
       >
     TCPProtocolProperties_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         TCPProtocolProperties
@@ -1063,53 +1064,53 @@ namespace RTCORBA
     TCPProtocolProperties_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
-  
+
   class TAO_RTCORBA_Export TCPProtocolProperties
     : public virtual RTCORBA::ProtocolProperties
   {
   public:
     typedef TCPProtocolProperties_ptr _ptr_type;
     typedef TCPProtocolProperties_var _var_type;
-    
+
     // The static operations.
     static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj);
-    
+
     static TCPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TCPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TCPProtocolProperties_ptr _nil (void)
     {
       return (TCPProtocolProperties_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_buffer_size (
         CORBA::Long send_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1117,20 +1118,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void recv_buffer_size (
         CORBA::Long recv_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1138,20 +1139,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean keep_alive (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void keep_alive (
         CORBA::Boolean keep_alive
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1159,20 +1160,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean dont_route (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void dont_route (
         CORBA::Boolean dont_route
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1180,20 +1181,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean no_delay (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void no_delay (
         CORBA::Boolean no_delay
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1201,20 +1202,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean enable_network_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void enable_network_priority (
         CORBA::Boolean enable_network_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1222,53 +1223,53 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     TCPProtocolProperties (void);
-    
+
     virtual ~TCPProtocolProperties (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     TCPProtocolProperties (const TCPProtocolProperties &);
-    
+
     void operator= (const TCPProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
+
   class GIOPProtocolProperties;
   typedef GIOPProtocolProperties *GIOPProtocolProperties_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         GIOPProtocolProperties
       >
     GIOPProtocolProperties_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         GIOPProtocolProperties
@@ -1276,86 +1277,86 @@ namespace RTCORBA
     GIOPProtocolProperties_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
-  
+
   class TAO_RTCORBA_Export GIOPProtocolProperties
     : public virtual RTCORBA::ProtocolProperties
   {
   public:
     typedef GIOPProtocolProperties_ptr _ptr_type;
     typedef GIOPProtocolProperties_var _var_type;
-    
+
     // The static operations.
     static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj);
-    
+
     static GIOPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static GIOPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static GIOPProtocolProperties_ptr _nil (void)
     {
       return (GIOPProtocolProperties_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     GIOPProtocolProperties (void);
-    
+
     virtual ~GIOPProtocolProperties (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     GIOPProtocolProperties (const GIOPProtocolProperties &);
-    
+
     void operator= (const GIOPProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
+
   class UnixDomainProtocolProperties;
   typedef UnixDomainProtocolProperties *UnixDomainProtocolProperties_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         UnixDomainProtocolProperties
       >
     UnixDomainProtocolProperties_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         UnixDomainProtocolProperties
@@ -1363,53 +1364,53 @@ namespace RTCORBA
     UnixDomainProtocolProperties_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
-  
+
   class TAO_RTCORBA_Export UnixDomainProtocolProperties
     : public virtual RTCORBA::ProtocolProperties
   {
   public:
     typedef UnixDomainProtocolProperties_ptr _ptr_type;
     typedef UnixDomainProtocolProperties_var _var_type;
-    
+
     // The static operations.
     static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj);
-    
+
     static UnixDomainProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static UnixDomainProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static UnixDomainProtocolProperties_ptr _nil (void)
     {
       return (UnixDomainProtocolProperties_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_buffer_size (
         CORBA::Long send_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1417,20 +1418,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void recv_buffer_size (
         CORBA::Long recv_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1438,53 +1439,53 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     UnixDomainProtocolProperties (void);
-    
+
     virtual ~UnixDomainProtocolProperties (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     UnixDomainProtocolProperties (const UnixDomainProtocolProperties &);
-    
+
     void operator= (const UnixDomainProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
+
   class SharedMemoryProtocolProperties;
   typedef SharedMemoryProtocolProperties *SharedMemoryProtocolProperties_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         SharedMemoryProtocolProperties
       >
     SharedMemoryProtocolProperties_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         SharedMemoryProtocolProperties
@@ -1492,53 +1493,53 @@ namespace RTCORBA
     SharedMemoryProtocolProperties_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
-  
+
   class TAO_RTCORBA_Export SharedMemoryProtocolProperties
     : public virtual RTCORBA::ProtocolProperties
   {
   public:
     typedef SharedMemoryProtocolProperties_ptr _ptr_type;
     typedef SharedMemoryProtocolProperties_var _var_type;
-    
+
     // The static operations.
     static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj);
-    
+
     static SharedMemoryProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static SharedMemoryProtocolProperties_ptr _nil (void)
     {
       return (SharedMemoryProtocolProperties_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Long preallocate_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void preallocate_buffer_size (
         CORBA::Long preallocate_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1546,20 +1547,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * mmap_filename (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void mmap_filename (
         const char * mmap_filename
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1567,20 +1568,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * mmap_lockname (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void mmap_lockname (
         const char * mmap_lockname
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1588,85 +1589,85 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     SharedMemoryProtocolProperties (void);
-    
+
     virtual ~SharedMemoryProtocolProperties (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &);
-    
+
     void operator= (const SharedMemoryProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct PriorityBand;
-  
+
   typedef
     TAO_Fixed_Var_T<
         PriorityBand
       >
     PriorityBand_var;
-  
+
   typedef
     PriorityBand &
     PriorityBand_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_RTCORBA_Export PriorityBand
   {
     typedef PriorityBand_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     RTCORBA::Priority low;
     RTCORBA::Priority high;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBand;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CH_)
 #define _RTCORBA_PRIORITYBANDS_CH_
-  
+
   class PriorityBands;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         PriorityBands,
         PriorityBand
       >
     PriorityBands_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         PriorityBands,
@@ -1674,7 +1675,7 @@ namespace RTCORBA
         PriorityBand
       >
     PriorityBands_out;
-  
+
   class TAO_RTCORBA_Export PriorityBands
     : public
         TAO_Unbounded_Sequence<
@@ -1687,44 +1688,44 @@ namespace RTCORBA
     PriorityBands (
         CORBA::ULong max,
         CORBA::ULong length,
-        PriorityBand* buffer, 
+        PriorityBand* buffer,
         CORBA::Boolean release = 0
       );
     PriorityBands (const PriorityBands &);
     ~PriorityBands (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef PriorityBands_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBands;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_
-  
+
   class PriorityBandedConnectionPolicy;
   typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PriorityBandedConnectionPolicy
       >
     PriorityBandedConnectionPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PriorityBandedConnectionPolicy
@@ -1732,116 +1733,116 @@ namespace RTCORBA
     PriorityBandedConnectionPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export PriorityBandedConnectionPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef PriorityBandedConnectionPolicy_ptr _ptr_type;
     typedef PriorityBandedConnectionPolicy_var _var_type;
-    
+
     // The static operations.
     static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
-    
+
     static PriorityBandedConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PriorityBandedConnectionPolicy_ptr _nil (void)
     {
       return (PriorityBandedConnectionPolicy_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::PriorityBands * priority_bands (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PriorityBandedConnectionPolicy (void);
-    
+
     virtual ~PriorityBandedConnectionPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
-    
+
     void operator= (const PriorityBandedConnectionPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_CURRENT__VAR_OUT_CH_)
 #define _RTCORBA_CURRENT__VAR_OUT_CH_
-  
+
   class Current;
   typedef Current *Current_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Current
@@ -1849,53 +1850,53 @@ namespace RTCORBA
     Current_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CURRENT_CH_)
 #define _RTCORBA_CURRENT_CH_
-  
+
   class TAO_RTCORBA_Export Current
     : public virtual CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _nil (void)
     {
       return (Current_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual RTCORBA::Priority the_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void the_priority (
         RTCORBA::Priority the_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1903,53 +1904,53 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Current (void);
-    
+
     virtual ~Current (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-    
+
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_MUTEX__VAR_OUT_CH_)
 #define _RTCORBA_MUTEX__VAR_OUT_CH_
-  
+
   class Mutex;
   typedef Mutex *Mutex_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Mutex
       >
     Mutex_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Mutex
@@ -1957,63 +1958,63 @@ namespace RTCORBA
     Mutex_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_MUTEX_CH_)
 #define _RTCORBA_MUTEX_CH_
-  
+
   class TAO_RTCORBA_Export Mutex
     : public virtual CORBA::Object
   {
   public:
     typedef Mutex_ptr _ptr_type;
     typedef Mutex_var _var_type;
-    
+
     // The static operations.
     static Mutex_ptr _duplicate (Mutex_ptr obj);
-    
+
     static Mutex_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Mutex_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Mutex_ptr _nil (void)
     {
       return (Mutex_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void lock (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void unlock (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean try_lock (
         TimeBase::TimeT max_wait
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2021,53 +2022,53 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Mutex (void);
-    
+
     virtual ~Mutex (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Mutex (const Mutex &);
-    
+
     void operator= (const Mutex &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_RTORB__VAR_OUT_CH_)
 #define _RTCORBA_RTORB__VAR_OUT_CH_
-  
+
   class RTORB;
   typedef RTORB *RTORB_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         RTORB
       >
     RTORB_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         RTORB
@@ -2075,53 +2076,53 @@ namespace RTCORBA
     RTORB_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_RTORB_CH_)
 #define _RTCORBA_RTORB_CH_
-  
+
   class TAO_RTCORBA_Export RTORB
     : public virtual CORBA::Object
   {
   public:
     typedef RTORB_ptr _ptr_type;
     typedef RTORB_var _var_type;
-    
+
     // The static operations.
     static RTORB_ptr _duplicate (RTORB_ptr obj);
-    
+
     static RTORB_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RTORB_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RTORB_ptr _nil (void)
     {
       return (RTORB_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::Mutex_ptr create_mutex (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy_mutex (
         RTCORBA::Mutex_ptr the_mutex
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2129,25 +2130,25 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_MUTEXNOTFOUND_CH_)
 #define _RTCORBA_RTORB_MUTEXNOTFOUND_CH_
-    
+
     class TAO_RTCORBA_Export MutexNotFound : public CORBA::UserException
     {
     public:
-      
+
       MutexNotFound (void);
       MutexNotFound (const MutexNotFound &);
       ~MutexNotFound (void);
 
       MutexNotFound &operator= (const MutexNotFound &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static MutexNotFound *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2159,28 +2160,28 @@ namespace RTCORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_MutexNotFound;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
         CORBA::Boolean_out created_flag
@@ -2189,10 +2190,10 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::Mutex_ptr open_named_mutex (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2201,10 +2202,10 @@ namespace RTCORBA
         CORBA::SystemException
         , RTCORBA::RTORB::MutexNotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties (
         CORBA::Long send_buffer_size,
         CORBA::Long recv_buffer_size,
@@ -2217,25 +2218,25 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_)
 #define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_
-    
+
     class TAO_RTCORBA_Export InvalidThreadpool : public CORBA::UserException
     {
     public:
-      
+
       InvalidThreadpool (void);
       InvalidThreadpool (const InvalidThreadpool &);
       ~InvalidThreadpool (void);
 
       InvalidThreadpool &operator= (const InvalidThreadpool &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static InvalidThreadpool *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2247,28 +2248,28 @@ namespace RTCORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_InvalidThreadpool;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual RTCORBA::ThreadpoolId create_threadpool (
         CORBA::ULong stacksize,
         CORBA::ULong static_threads,
@@ -2282,10 +2283,10 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes (
         CORBA::ULong stacksize,
         const RTCORBA::ThreadpoolLanes & lanes,
@@ -2298,10 +2299,10 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy_threadpool (
         RTCORBA::ThreadpoolId threadpool
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2310,10 +2311,10 @@ namespace RTCORBA
         CORBA::SystemException
         , RTCORBA::RTORB::InvalidThreadpool
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
         RTCORBA::PriorityModel priority_model,
         RTCORBA::Priority server_priority
@@ -2322,10 +2323,10 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
         RTCORBA::ThreadpoolId threadpool
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2333,10 +2334,10 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
         const RTCORBA::PriorityBands & priority_bands
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2344,10 +2345,10 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
         const RTCORBA::ProtocolList & protocols
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2355,10 +2356,10 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
         const RTCORBA::ProtocolList & protocols
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2366,46 +2367,46 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     RTORB (void);
-    
+
     virtual ~RTORB (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     RTORB (const RTORB &);
-    
+
     void operator= (const RTORB &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RTORB;
 
 // TAO_IDL - Generated from
@@ -2422,7 +2423,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityModelPolicy>
   {
@@ -2443,7 +2444,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY__TRAITS_CH_)
 #define _RTCORBA_THREADPOOLPOLICY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ThreadpoolPolicy>
   {
@@ -2464,7 +2465,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ProtocolProperties>
   {
@@ -2485,7 +2486,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ServerProtocolPolicy>
   {
@@ -2506,7 +2507,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ClientProtocolPolicy>
   {
@@ -2527,7 +2528,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PrivateConnectionPolicy>
   {
@@ -2548,7 +2549,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::TCPProtocolProperties>
   {
@@ -2569,7 +2570,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::GIOPProtocolProperties>
   {
@@ -2590,7 +2591,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::UnixDomainProtocolProperties>
   {
@@ -2611,7 +2612,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>
   {
@@ -2632,7 +2633,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>
   {
@@ -2653,7 +2654,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_CURRENT__TRAITS_CH_)
 #define _RTCORBA_CURRENT__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Current>
   {
@@ -2674,7 +2675,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_MUTEX__TRAITS_CH_)
 #define _RTCORBA_MUTEX__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Mutex>
   {
@@ -2695,7 +2696,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_RTORB__TRAITS_CH_)
 #define _RTCORBA_RTORB__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::RTORB>
   {
@@ -2953,4 +2954,3 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 2f7547f5c8b..83e195b4b99 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -7,6 +7,7 @@
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
+#include "tao/SystemException.h"
 #include "ace/OS_NS_strings.h"
 
 ACE_RCSID (RTCORBA,
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index 3ee8de165b4..dd75f7ba1bd 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -6,6 +6,7 @@
 #include "RT_Stub.h"
 
 #include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 289e3c84751..3922e329db8 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -47,6 +47,11 @@ namespace TAO
   class ObjectKey;
 }
 
+namespace IOP
+{
+  struct IOR;
+}
+
 /**
  * @class TAO_Stub
  *
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index 872dea0e5fc..7c1621cf566 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -51,9 +51,6 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void)
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
     , internal_lock_ (new TAO_SYNCH_RECURSIVE_MUTEX)
 # endif /* ACE_MT_SAFE */
-#if defined (ACE_HAS_EXCEPTIONS)
-    , old_unexpected_ (0)
-#endif  /* ACE_HAS_EXCEPTIONS */
 {
   // Be sure that no further instances are created via instance ().
   if (instance_ == 0)
@@ -251,19 +248,6 @@ TAO_Singleton_Manager::fini (void)
   this->internal_lock_ = 0;
 #endif /* ACE_MT_SAFE */
 
-#if defined (ACE_HAS_EXCEPTIONS)
-  // Restore the old unexpected exception handler since TAO will no
-  // longer be handling exceptions.  Allow the application to once
-  // again handle unexpected exceptions.
-# if (!defined (_MSC_VER) \
-      && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \
-      && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)) || defined (ghs)
-  (void) std::set_unexpected (this->old_unexpected_);
-# else
-  (void) set_unexpected (this->old_unexpected_);
-# endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-#endif /* ACE_HAS_EXCEPTIONS */
-
   // Indicate that this TAO_Singleton_Manager instance has been shut down.
   this->object_manager_state_ = OBJ_MAN_SHUT_DOWN;
 
@@ -300,26 +284,6 @@ TAO_Singleton_Manager::shutting_down (void)
     : 1;
 }
 
-#if defined (ACE_HAS_EXCEPTIONS)
-void
-TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u)
-{
-  // This must be done after the system TypeCodes and Exceptions have
-  // been initialized.  An unexpected exception will cause TAO's
-  // unexpected exception handler to be called.  That handler
-  // transforms all unexpected exceptions to CORBA::UNKNOWN, which of
-  // course requires the TypeCode constants and system exceptions to
-  // have been initialized.
-# if (!defined (_MSC_VER) \
-      && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \
-      && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)) || defined (ghs)
-  this->old_unexpected_ = std::set_unexpected (u);
-# else
-  this->old_unexpected_ = set_unexpected (u);
-# endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-}
-#endif /* ACE_HAS_EXCEPTIONS */
-
 int
 TAO_Singleton_Manager::at_exit_i (void *object,
                                   ACE_CLEANUP_FUNC cleanup_hook,
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index 891a31ebf0e..079f27eaebf 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -28,10 +28,6 @@
 #include "tao/orbconf.h"
 #include "ace/Object_Manager_Base.h"
 
-#if defined (ACE_HAS_EXCEPTIONS)
-typedef void (*TAO_unexpected_handler)(void);
-#endif  /* ACE_HAS_EXCEPTIONS */
-
 
 /// Adapter for cleanup, used to register cleanup function with the
 /// ACE_Object_Manager.
@@ -149,17 +145,6 @@ public:
                       ACE_CLEANUP_FUNC cleanup_hook,
                       void *param);
 
-#if defined (ACE_HAS_EXCEPTIONS)
-  /// Set a new unexpected exception handler.
-  /**
-   * The old one will be stored for restoration later on.
-   *
-   * @note Calling this method multiple times will cause the stored
-   *       old unexpected exception handler pointer to be lost.
-   */
-  void _set_unexpected (TAO_unexpected_handler u);
-#endif /* ACE_HAS_EXCEPTIONS */
-
 private:
   /// Force allocation on the heap.
   //@{
@@ -202,17 +187,6 @@ private:
   TAO_SYNCH_RECURSIVE_MUTEX *internal_lock_;
 #endif /* ACE_MT_SAFE */
 
-#if defined (ACE_HAS_EXCEPTIONS)
-  /// The old unexpected exception handler.
-  /**
-   * A pointer to the old unexpected exception handler is stored so
-   * that it can be restored when TAO is unloaded, for example.
-   * Otherwise, any unexpected exceptions will result in a call to
-   * TAO's unexpected exception handler which may no longer exist if
-   * TAO was unloaded.
-   */
-  TAO_unexpected_handler old_unexpected_;
-#endif  /* ACE_HAS_EXCEPTIONS */
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 057ba51c9c8..6c340121e4e 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -2,6 +2,7 @@
 #define TAO_UTILS_RIR_NARROW_CPP
 
 #include "RIR_Narrow.h"
+#include "tao/SystemException.h"
 #include <stdexcept>
 
 ACE_RCSID (Utils,