ChangeLogTag: Tue Oct 10 19:08:41 2000 Jeff Parsons <parsons@cs.wustl.edu>

4 files changed, 329 insertions, 292 deletions

diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 079f9c46d9d..368d5f350c1 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -613,13 +613,14 @@ CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_d
 
 #endif /* TAO_HAS_INTERCEPTORS && TAO_HAS_INTERFACE_REPOSITORY */
 
-  CORBA_ConstructionPolicy_ptr (*_TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer) (
-      CORBA::Object_ptr obj
-    ) = 0;
-    void operator<<= (CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr _tao_elem)
-  {
-    TAO_OutputCDR stream;
-    if (stream << _tao_elem)
+CORBA_ConstructionPolicy_ptr (*_TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+void operator<<= (CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr _tao_elem)
+{
+  TAO_OutputCDR stream;
+  if (stream << _tao_elem)
     {
       _tao_any._tao_replace (
           CORBA::_tc_ConstructionPolicy,
@@ -630,11 +631,11 @@ CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_d
           CORBA_ConstructionPolicy::_tao_any_destructor
         );
     }
-  }
+}
 
-  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr &_tao_elem)
-  {
-    ACE_TRY_NEW_ENV
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr &_tao_elem)
+{
+  ACE_TRY_NEW_ENV
     {
       _tao_elem = CORBA_ConstructionPolicy::_nil ();
       CORBA::TypeCode_var type = _tao_any.type ();
@@ -658,15 +659,15 @@ CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_d
         return 1;
       }
     }
-    ACE_CATCHANY
+  ACE_CATCHANY
     {
       _tao_elem = CORBA_ConstructionPolicy::_nil ();
       return 0;
     }
-    ACE_ENDTRY;
-    _tao_elem = CORBA_ConstructionPolicy::_nil ();
-    return 0;
-  }
+  ACE_ENDTRY;
+  _tao_elem = CORBA_ConstructionPolicy::_nil ();
+  return 0;
+}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
       defined (ACE_HAS_GNU_REPO)
@@ -682,77 +683,78 @@ template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPol
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_
 
-    // The Base_Sequence functions, please see tao/Sequence.h
-    void
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer (CORBA::ULong length)
-    {
-      CORBA_DomainManager **tmp = 0;
-      tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length);
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_DomainManager **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length);
 
-      if (this->buffer_ != 0)
-      {
-        CORBA_DomainManager **old = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
-        for (CORBA::ULong i = 0; i < this->length_; ++i)
-          if (!this->release_)
-            tmp[i] = CORBA_DomainManager::_duplicate (old[i]);
-          else
-            tmp[i] = old[i];
+  if (this->buffer_ != 0)
+    {
+      CORBA_DomainManager **old = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        if (!this->release_)
+          tmp[i] = CORBA_DomainManager::_duplicate (old[i]);
+        else
+          tmp[i] = old[i];
 
-        if (this->release_)
-          delete[] old;
+      if (this->release_)
+        delete[] old;
 
-      }
-      this->buffer_ = tmp;
     }
+  this->buffer_ = tmp;
+}
 
-    void
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void)
+void
+_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      if (this->buffer_ == 0 || this->release_ == 0)
-        return;
-      CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA_DomainManager::_nil ();
-      }
-      _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
-      this->buffer_ = 0;
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA_DomainManager::_nil ();
     }
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
+  this->buffer_ = 0;
+}
 
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void)
-    {
-      this->_deallocate_buffer ();
-    }
+_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void)
+{
+  this->_deallocate_buffer ();
+}
 
-    void
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-    {
-      CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
+void
+_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
 
-      for (CORBA::ULong i = nl; i < ol; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA_DomainManager::_nil ();
-      }
-    }
-    void
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV
-      )
+  for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, target);
-      *tmp = CORBA_DomainManager::_narrow (src, ACE_TRY_ENV);
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA_DomainManager::_nil ();
     }
+}
 
-    CORBA_Object*
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *src) const
-    {
-      CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, src);
-      return *tmp;
-    }
+void
+_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, target);
+  *tmp = CORBA_DomainManager::_narrow (src, ACE_TRY_ENV);
+}
+
+CORBA_Object*
+_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *src) const
+{
+  CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, src);
+  return *tmp;
+}
 
 #endif /* end #if !defined */
 
@@ -762,57 +764,69 @@ template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPol
 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
 #define _CORBA_DOMAINMANAGERLIST_CS_
 
-  // *************************************************************
-  // CORBA_DomainManagerList
-  // *************************************************************
+// *************************************************************
+// CORBA_DomainManagerList
+// *************************************************************
+
+CORBA_DomainManagerList::CORBA_DomainManagerList (void)
+{}
 
-  CORBA_DomainManagerList::CORBA_DomainManagerList (void)
-  {}
-  CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max) // uses max size
-    :
+CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max) // uses max size
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
+  TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-   (max)
-  {}
-  CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max, CORBA::ULong length, CORBA_DomainManager_ptr *buffer, CORBA::Boolean release)
-    :
+  (max)
+{}
+
+CORBA_DomainManagerList::CORBA_DomainManagerList (
+    CORBA::ULong max, 
+    CORBA::ULong length, 
+    CORBA_DomainManager_ptr *buffer, 
+    CORBA::Boolean release
+  )
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
+  TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-   (max, length, buffer, release)
-  {}
-  CORBA_DomainManagerList::CORBA_DomainManagerList (const CORBA_DomainManagerList &seq) // copy ctor
-    :
+  (max, length, buffer, release)
+{}
+
+CORBA_DomainManagerList::CORBA_DomainManagerList (
+    const CORBA_DomainManagerList &seq
+  ) // copy ctor
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
+  TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-   (seq)
-  {}
-  CORBA_DomainManagerList::~CORBA_DomainManagerList (void) // dtor
-  {}
-  void CORBA_DomainManagerList::_tao_any_destructor (void *x)
-  {
-    CORBA_DomainManagerList *tmp = ACE_static_cast (CORBA_DomainManagerList*,x);
-    delete tmp;
-  }
+  (seq)
+{}
 
+CORBA_DomainManagerList::~CORBA_DomainManagerList (void) // dtor
+{}
+
+void CORBA_DomainManagerList::_tao_any_destructor (void *x)
+{
+  CORBA_DomainManagerList *tmp = ACE_static_cast (CORBA_DomainManagerList*,x);
+  delete tmp;
+}
 
 #endif /* end #if !defined */
 
-    CORBA_DomainManager_ptr (*_TAO_collocation_CORBA_DomainManager_Stub_Factory_function_pointer) (
-      CORBA::Object_ptr obj
-    ) = 0;
-    void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManager_ptr _tao_elem)
-  {
-    TAO_OutputCDR stream;
-    if (stream << _tao_elem)
+CORBA_DomainManager_ptr (*_TAO_collocation_CORBA_DomainManager_Stub_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManager_ptr _tao_elem)
+{
+  TAO_OutputCDR stream;
+  if (stream << _tao_elem)
     {
       _tao_any._tao_replace (
           CORBA::_tc_DomainManager,
@@ -823,11 +837,11 @@ template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPol
           CORBA_DomainManager::_tao_any_destructor
         );
     }
-  }
+}
 
-  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr &_tao_elem)
-  {
-    ACE_TRY_NEW_ENV
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr &_tao_elem)
+{
+  ACE_TRY_NEW_ENV
     {
       _tao_elem = CORBA_DomainManager::_nil ();
       CORBA::TypeCode_var type = _tao_any.type ();
@@ -851,30 +865,30 @@ template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPol
         return 1;
       }
     }
-    ACE_CATCHANY
+  ACE_CATCHANY
     {
       _tao_elem = CORBA_DomainManager::_nil ();
       return 0;
     }
-    ACE_ENDTRY;
-    _tao_elem = CORBA_DomainManager::_nil ();
-    return 0;
-  }
+  ACE_ENDTRY;
+  _tao_elem = CORBA_DomainManager::_nil ();
+  return 0;
+}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
       defined (ACE_HAS_GNU_REPO)
-      template class TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #  pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
-  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-    void operator<<= (
-      CORBA::Any &_tao_any,
-      const CORBA_DomainManagerList &_tao_elem
-    ) // copying
-  {
-    TAO_OutputCDR stream;
-    if (stream << _tao_elem)
+  template class TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA_DomainManagerList &_tao_elem
+  ) // copying
+{
+  TAO_OutputCDR stream;
+  if (stream << _tao_elem)
     {
       _tao_any._tao_replace (
           CORBA::_tc_DomainManagerList,
@@ -882,34 +896,34 @@ template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPol
           stream.begin ()
         );
     }
-  }
+}
 
-  void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManagerList *_tao_elem) // non copying
-  {
-    TAO_OutputCDR stream;
-    stream << *_tao_elem;
-    _tao_any._tao_replace (
-        CORBA::_tc_DomainManagerList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        _tao_elem,
-        CORBA_DomainManagerList::_tao_any_destructor
-      );
-  }
+void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManagerList *_tao_elem) // non copying
+{
+  TAO_OutputCDR stream;
+  stream << *_tao_elem;
+  _tao_any._tao_replace (
+      CORBA::_tc_DomainManagerList,
+      TAO_ENCAP_BYTE_ORDER,
+      stream.begin (),
+      1,
+      _tao_elem,
+      CORBA_DomainManagerList::_tao_any_destructor
+    );
+}
 
-  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManagerList *&_tao_elem)
-  {
-    return _tao_any >>= ACE_const_cast(
-        const CORBA_DomainManagerList*&,
-        _tao_elem
-      );
-  }
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManagerList *&_tao_elem)
+{
+  return _tao_any >>= ACE_const_cast(
+      const CORBA_DomainManagerList*&,
+      _tao_elem
+    );
+}
 
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManagerList *&_tao_elem)
-  {
-    _tao_elem = 0;
-    ACE_TRY_NEW_ENV
+{
+  _tao_elem = 0;
+  ACE_TRY_NEW_ENV
     {
       CORBA::TypeCode_var type = _tao_any.type ();
       if (!type->equivalent (CORBA::_tc_DomainManagerList, ACE_TRY_ENV)) // not equal
@@ -950,19 +964,19 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage
         }
       }
     }
-    ACE_CATCHANY
+  ACE_CATCHANY
     {
     }
-    ACE_ENDTRY;
-    return 0;
-  }
+  ACE_ENDTRY;
+  return 0;
+}
 
-  CORBA::Boolean operator<< (
-      TAO_OutputCDR &strm,
-      const CORBA_DomainManagerList &_tao_sequence
-    )
-  {
-    if (strm << _tao_sequence.length ())
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_DomainManagerList &_tao_sequence
+  )
+{
+  if (strm << _tao_sequence.length ())
     {
       // encode all elements
       CORBA::Boolean _tao_marshal_flag = 1;
@@ -972,16 +986,16 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage
       }
       return _tao_marshal_flag;
     }
-    return 0; // error
-  }
+  return 0; // error
+}
 
-  CORBA::Boolean operator>> (
-      TAO_InputCDR &strm,
-      CORBA_DomainManagerList &_tao_sequence
-    )
-  {
-    CORBA::ULong _tao_seq_len;
-    if (strm >> _tao_seq_len)
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_DomainManagerList &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  if (strm >> _tao_seq_len)
     {
       // set the length of the sequence
       _tao_sequence.length (_tao_seq_len);
@@ -996,5 +1010,5 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage
       }
       return _tao_marshal_flag;
     }
-    return 0; // error
-  }
+  return 0; // error
+}
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index ce6be1cb9b6..d04a612a7c5 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -169,46 +169,54 @@ class TAO_Export CORBA_DomainManager : public virtual CORBA_Object
     CORBA_DomainManager (const CORBA_DomainManager &);
     void operator= (const CORBA_DomainManager &);
 #if (TAO_HAS_INTERCEPTORS == 1)
-        // Generation of interceptors related RequestInfo classes per operation.
+    // Generation of interceptors related RequestInfo classes per operation.
     // This needed to be able to store the arguments, exceptiosn, constexts
     // and build the lists dynamically on demand so that unnecessary time overhead
     // of building these lists when they arent used is avoided.
-            class TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy : public TAO_ClientRequest_Info
+    class TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy 
+      : public TAO_ClientRequest_Info
     {
     public:
       friend class CORBA_DomainManager;
       TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy (
-        const char *_tao_operation,
-        IOP::ServiceContextList &_tao_service_context_list,
-        CORBA::Object *_tao_target            ,      CORBA::PolicyType& policy_type      ,
-            CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-      );
-
-       virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
-
-        virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ())
-     ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ())
-   ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-private:
-TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy &);
-void operator= (const TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy &);
-CORBA::PolicyType & policy_type_;
-void result (CORBA_Policy_ptr  result);
- // update the result
-CORBA_Policy_ptr  result_;
-};
+          const char *_tao_operation,
+          IOP::ServiceContextList &_tao_service_context_list,
+          CORBA::Object *_tao_target,
+          CORBA::PolicyType& policy_type,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      virtual Dynamic::ParameterList * arguments (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      virtual Dynamic::ExceptionList * exceptions (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      virtual CORBA::Any * result (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+    private:
+      TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy (
+          const TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy &
+        );
+      void operator= (
+          const TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy &
+        );
+      CORBA::PolicyType &policy_type_;
+      void result (CORBA_Policy_ptr  result);
+      // update the result
+      CORBA_Policy_ptr  result_;
+    };
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
diff --git a/TAO/tao/PortableServer/DomainS.cpp b/TAO/tao/PortableServer/DomainS.cpp
index 9ec89248e7f..527cd094cd3 100644
--- a/TAO/tao/PortableServer/DomainS.cpp
+++ b/TAO/tao/PortableServer/DomainS.cpp
@@ -551,31 +551,34 @@ POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_p
 {
    // Generate the arg list on demand
   CORBA::ULong length = 0;
-        length = this->parameter_list_.length ();
-      this->parameter_list_.length (length + 1);
-      this->parameter_list_[length].argument <<=  this->policy_type_;
+  length = this->parameter_list_.length ();
+  this->parameter_list_.length (length + 1);
+  this->parameter_list_[length].argument <<=  this->policy_type_;
 
-    this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+  this->parameter_list_[length].mode = Dynamic::PARAM_IN;
 
-    return &this->parameter_list_;
+  return &this->parameter_list_;
 }
 
-  Dynamic::ExceptionList *
-  POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
- // Generate the exception list on demand
+Dynamic::ExceptionList *
+POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::exceptions (
+    CORBA::Environment &
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand
   return 0;
 }
 
 
-  CORBA::Any *
-POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::result (CORBA::Environment &)
+CORBA::Any *
+POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::result (
+    CORBA::Environment &
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
- // Generate the result on demand
-
-return &this->result_val_;
+  // Generate the result on demand.
+  return &this->result_val_;
 }
 
 void
@@ -773,16 +776,20 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
     ACE_THROW (CORBA::MARSHAL());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter
-    _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV));
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)
+    );
   ACE_CHECK;
-  // @@ CORBA::Object_var _tao_objref;
-    POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager  ri ("make_domain_manager",
-_tao_server_request.service_info ()    ,  object_type.in ()    ,  constr_policy    ,
-    ACE_TRY_ENV);
-if (_tao_vfr.valid ())
+  POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager ri (
+      "make_domain_manager",
+      _tao_server_request.service_info (),  
+      object_type.in (),
+      constr_policy,
+      ACE_TRY_ENV
+    );
+
+  if (_tao_vfr.valid ())
     {
-      // @@ _tao_objref = _tao_server_request.objref (ACE_TRY_ENV);
       ACE_CHECK;
     }
 
@@ -790,41 +797,40 @@ if (_tao_vfr.valid ())
     {
       ri.request_id (_tao_server_request.request_id ());
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-    TAO_INTERCEPTOR_CHECK;
+      TAO_INTERCEPTOR_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
 
-    _tao_impl->make_domain_manager (
-      object_type.in (),
-      constr_policy,
-      ACE_TRY_ENV
-    );
-
-    TAO_INTERCEPTOR_CHECK;
+      _tao_impl->make_domain_manager (
+          object_type.in (),
+          constr_policy,
+          ACE_TRY_ENV
+        );
 
+      TAO_INTERCEPTOR_CHECK;
 
-    #if (TAO_HAS_INTERCEPTORS == 1)
+#if (TAO_HAS_INTERCEPTORS == 1)
 
-   _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-  TAO_INTERCEPTOR_CHECK;
-}
-ACE_CATCHANY
-  {
-    ri.exception (&ACE_ANY_EXCEPTION);
-    _tao_vfr.send_exception (&ri,
-        ACE_TRY_ENV
-      );
-    ACE_RE_THROW;
-  }
-ACE_ENDTRY;
-ACE_CHECK;
+      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      TAO_INTERCEPTOR_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (&ri,
+          ACE_TRY_ENV
+        );
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
 
-_tao_server_request.init_reply (ACE_TRY_ENV);
-ACE_CHECK;
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
 #else
- ACE_UNUSED_ARG (_tao_server_request);
- ACE_UNUSED_ARG (_tao_object_reference);
- ACE_THROW (CORBA::NO_IMPLEMENT ());
+  ACE_UNUSED_ARG (_tao_server_request);
+  ACE_UNUSED_ARG (_tao_object_reference);
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 #endif /* TAO_HAS_INTERFACE_REPOSITORY */
 }
 
@@ -1030,7 +1036,7 @@ void POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy::make_domain_manager
 POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager (
     const char *_tao_operation,
     IOP::ServiceContextList &_tao_service_context_list,
-    IR_InterfaceDef_ptr object_type,
+    IR_InterfaceDef *object_type,
     CORBA::Boolean &constr_policy,
     CORBA::Environment &
   )
diff --git a/TAO/tao/PortableServer/DomainS.h b/TAO/tao/PortableServer/DomainS.h
index 0a0fdf4ec46..207491c3c54 100644
--- a/TAO/tao/PortableServer/DomainS.h
+++ b/TAO/tao/PortableServer/DomainS.h
@@ -110,36 +110,43 @@
     public:
       friend class POA_CORBA_DomainManager;
       TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy (
-        const char *  _tao_operation,
-        IOP::ServiceContextList &_tao_service_context_list            ,      CORBA::PolicyType& policy_type      ,
-            CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-      );
-
-       virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
-
-        virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ())
-     ACE_THROW_SPEC ((CORBA::SystemException));
+          const char * _tao_operation,
+          IOP::ServiceContextList &_tao_service_context_list,
+          CORBA::PolicyType& policy_type,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      virtual Dynamic::ParameterList * arguments (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CORBA::Any * result (
-    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ())
-   ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual Dynamic::ExceptionList * exceptions (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((CORBA::SystemException));
 
+      virtual CORBA::Any * result (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((CORBA::SystemException));
 
-private:
-TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy (const TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy &);
-void operator= (const TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy &);
-CORBA::PolicyType & policy_type_;
-void result (CORBA::Policy_ptr  result);
- // update the result
-CORBA::Policy_ptr  result_;
-};
+    private:
+      TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy (
+          const TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy &
+        );
+      void operator= (
+          const TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy &
+        );
+      CORBA::PolicyType &policy_type_;
+      void result (CORBA::Policy_ptr  result);
+      // update the result
+      CORBA::Policy_ptr  result_;
+    };
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
@@ -149,7 +156,7 @@ CORBA::Policy_ptr  result_;
 #if !defined (_CORBA_DOMAINMANAGER___THRU_POA_COLLOCATED_SH_)
 #define _CORBA_DOMAINMANAGER___THRU_POA_COLLOCATED_SH_
 
-class TAO_PortableServer_Export POA_CORBA__tao_thru_poa_collocated_DomainManager   : public virtual ::CORBA::DomainManager
+class TAO_PortableServer_Export POA_CORBA__tao_thru_poa_collocated_DomainManager : public virtual ::CORBA::DomainManager
 {
 public:
   POA_CORBA__tao_thru_poa_collocated_DomainManager (
@@ -182,7 +189,9 @@ public:
 #if !defined (_CORBA_DOMAINMANAGER___DIRECT_COLLOCATED_SH_)
 #define _CORBA_DOMAINMANAGER___DIRECT_COLLOCATED_SH_
 
-class TAO_PortableServer_Export POA_CORBA__tao_direct_collocated_DomainManager   :  public virtual CORBA::DomainManager, public virtual TAO_Collocated_Object
+class TAO_PortableServer_Export POA_CORBA__tao_direct_collocated_DomainManager 
+  : public virtual CORBA::DomainManager, 
+    public virtual TAO_Collocated_Object
 {
 public:
   POA_CORBA__tao_direct_collocated_DomainManager (
@@ -384,7 +393,7 @@ public:
     TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager (
       const char *_tao_operation,
       IOP::ServiceContextList &_tao_service_context_list,
-      IR_InterfaceDef_ptr object_type,
+      IR_InterfaceDef *object_type,
       CORBA::Boolean &constr_policy,
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
@@ -415,7 +424,7 @@ public:
     void operator= (
         const TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager &
       );
-    IR_InterfaceDef_ptr object_type_;
+    IR_InterfaceDef *object_type_;
     CORBA::Boolean &constr_policy_;
 };