ChangeLogTag:Fri Sep 1 11:26:54 2000 Carlos O'Ryan <coryan@uci.edu>

13 files changed, 198 insertions, 186 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 83f6de842d4..33cb37f3dd7 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,7 +1,39 @@
+Fri Sep  1 11:26:54 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tao/DomainC.h:
+        * tao/DomainC.i:
+        * tao/DomainC.cpp:
+        * tao/PortableServer/DomainS.h:
+        * tao/PortableServer/DomainS.i:
+        * tao/PortableServer/DomainS.cpp:
+        * tao/PortableServer/DomainS_T.i:
+          CORBA::ConstructionPolicy should be disabled in minimum CORBA
+          builds.
+
+        * tao/PortableServer/POA.cpp:
+          Now we need the definition of TAO_POA::objectkey_prefix even
+          when compiling with minimum CORBA, this is because the IOR table
+          will be implemented as an alternative object adapter, so it
+          could be present even with minimum CORBA disabled.
+          Fixed warning when compiling with minimum CORBA enabled.
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          When minimum CORBA is enabled the ForwardRequest exception does
+          not exists, so we cannot catch it.
+
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/GIOP_Message_Acceptors.cpp:
+          When using minimum CORBA the ServerRequest class has no params_
+          field, only set it for full CORBA builds.
+
+        * tao/corbafwd.h:
+          Remove references to FieldName, it was part of the old dynamic
+          any interfaces.
+
 Fri Sep  1 11:24:12 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* orbsvcs/IFR_Service/TCF_Loader.cpp (create_object): 
-	  Removed declaration of unused parameters (argc and argv).	  
+        * orbsvcs/IFR_Service/TCF_Loader.cpp (create_object):
+          Removed declaration of unused parameters (argc and argv).
 
 Fri Sep  1 13:07:23 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 640020f6c3d..12b08823ab7 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -179,8 +179,8 @@ _tao_call.service_info (),
             (_tao_in >> _tao_safe_retval.inout ())
         ))
       TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-CORBA::Policy_ptr  _tao_retval_info = _tao_safe_retval._retn ();
     TAO_INTERCEPTOR (
+        CORBA::Policy_ptr  _tao_retval_info = _tao_safe_retval._retn ();
 
          ri.result (_tao_retval_info);
         _tao_safe_retval = _tao_retval_info;
@@ -297,6 +297,8 @@ CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_polic
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 // default constructor
 CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (void)
 {}
@@ -579,6 +581,70 @@ 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)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_ConstructionPolicy,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          CORBA_ConstructionPolicy::_duplicate (_tao_elem),
+          CORBA_ConstructionPolicy::_tao_any_destructor
+        );
+    }
+  }
+
+  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 ();
+      if (!type->equivalent (CORBA::_tc_ConstructionPolicy, ACE_TRY_ENV)) // not equal
+        {
+          return 0;
+        }
+      ACE_TRY_CHECK;
+      TAO_InputCDR stream (
+          _tao_any._tao_get_cdr (),
+          _tao_any._tao_byte_order ()
+        );
+      if (stream >> _tao_elem)
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_ConstructionPolicy,
+            1,
+            _tao_elem,
+            CORBA_ConstructionPolicy::_tao_any_destructor
+          );
+        return 1;
+      }
+    }
+    ACE_CATCHANY
+    {
+      _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)
+template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_)
@@ -770,68 +836,6 @@ CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_d
     #  pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
   #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-  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,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          CORBA_ConstructionPolicy::_duplicate (_tao_elem),
-          CORBA_ConstructionPolicy::_tao_any_destructor
-        );
-    }
-  }
-
-  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 ();
-      if (!type->equivalent (CORBA::_tc_ConstructionPolicy, ACE_TRY_ENV)) // not equal
-        {
-          return 0;
-        }
-      ACE_TRY_CHECK;
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ConstructionPolicy,
-            1,
-            _tao_elem,
-            CORBA_ConstructionPolicy::_tao_any_destructor
-          );
-        return 1;
-      }
-    }
-    ACE_CATCHANY
-    {
-      _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)
-      template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #  pragma instantiate TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>
-  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
     void operator<<= (
       CORBA::Any &_tao_any,
       const CORBA_DomainManagerList &_tao_elem
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 6b4a1b10f06..04e3a916fe9 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -217,23 +217,11 @@ CORBA_Policy_ptr  result_;
 
 #endif /* end #if !defined */
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_DomainManager;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SecConstruction;
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___PTR_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___PTR_CH_
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
 class CORBA_ConstructionPolicy;
 typedef CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr;
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___VAR_CH_
-
 class TAO_Export CORBA_ConstructionPolicy_var : public TAO_Base_var
 {
 public:
@@ -262,13 +250,6 @@ private:
   CORBA_ConstructionPolicy_var &operator= (const TAO_Base_var &rhs);
 };
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___OUT_CH_
-
 class TAO_Export CORBA_ConstructionPolicy_out
 {
 public:
@@ -286,13 +267,6 @@ private:
   CORBA_ConstructionPolicy_ptr &ptr_;
 };
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY_CH_
-
 class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA_Policy
 {
 public:
@@ -394,10 +368,7 @@ CORBA::Boolean & constr_policy_;
 };
 
 
-#endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy;
-
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -547,21 +518,27 @@ private:
 
 #endif /* end #if !defined */
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_DomainManagerList;
-
-
 extern TAO_Export CORBA_DomainManager_ptr (*_TAO_collocation_CORBA_DomainManager_Stub_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 // Any operators for interface CORBA_DomainManager
 TAO_Export void operator<<= (CORBA::Any &, CORBA_DomainManager_ptr);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManager *&);
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 extern TAO_Export CORBA_ConstructionPolicy_ptr (*_TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 // Any operators for interface CORBA_ConstructionPolicy
 TAO_Export void operator<<= (CORBA::Any &, CORBA_ConstructionPolicy_ptr);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstructionPolicy *&);
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstructionPolicy_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstructionPolicy_ptr &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA_DomainManagerList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA_DomainManagerList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManagerList *&); // deprecated
@@ -571,8 +548,6 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_DomainMan
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_DomainManager_ptr );
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_DomainManager_ptr &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstructionPolicy_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstructionPolicy_ptr &);
 
 #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_H_
 #define _TAO_CDR_OP_CORBA_DomainManagerList_H_
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index 551275895ef..0e9d28daad3 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -188,21 +188,13 @@ CORBA_DomainManager_out::operator-> (void)
 
 #endif /* end #if !defined */
 
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
-#define _CORBA_CONSTRUCTIONPOLICY___CI_
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
 ACE_INLINE
 CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
   : CORBA_Object (objref, _tao_collocated)
 {}
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CI_)
-#define _CORBA_CONSTRUCTIONPOLICY___VAR_CI_
-
 // *************************************************************
 // Inline operations for class CORBA_ConstructionPolicy_var
 // *************************************************************
@@ -296,13 +288,6 @@ CORBA_ConstructionPolicy_var::_retn (void)
   return val;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CI_)
-#define _CORBA_CONSTRUCTIONPOLICY___OUT_CI_
-
 // *************************************************************
 // Inline operations for class CORBA_ConstructionPolicy_out
 // *************************************************************
@@ -367,7 +352,57 @@ CORBA_ConstructionPolicy_out::operator-> (void)
 }
 
 
-#endif /* end #if !defined */
+ACE_INLINE CORBA::Boolean
+operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ConstructionPolicy_ptr
+  );
+ACE_INLINE CORBA::Boolean
+operator>> (
+    TAO_InputCDR &,
+    CORBA_ConstructionPolicy_ptr &
+  );
+
+ACE_INLINE CORBA::Boolean
+operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ConstructionPolicy_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+ACE_INLINE CORBA::Boolean
+operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ConstructionPolicy_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ConstructionPolicy::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -779,56 +814,6 @@ operator>> (
   return 0;
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ConstructionPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA_ConstructionPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ConstructionPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_ConstructionPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_ConstructionPolicy::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-
 #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_I_
 #define _TAO_CDR_OP_CORBA_DomainManagerList_I_
 
diff --git a/TAO/tao/GIOP_Message_Acceptors.cpp b/TAO/tao/GIOP_Message_Acceptors.cpp
index 48386fa9f98..1c0122c579a 100644
--- a/TAO/tao/GIOP_Message_Acceptors.cpp
+++ b/TAO/tao/GIOP_Message_Acceptors.cpp
@@ -125,7 +125,9 @@ TAO_GIOP_Message_Acceptors::
           // Sending back the same service context list we received in the
           // Request.  (Important for RT CORBA).
           reply_params.service_context_notowned (&request.service_info ());
+#if (TAO_HAS_MINIMUM_CORBA == 0)
           reply_params.params_ = 0;
+#endif /* TAO_HAS_MINIMUM_CORBA */
           // Make the GIOP header and Reply header
           this->write_reply_header (*this->output_,
                                     reply_params);
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 4c284063bde..53a1c318b4b 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -607,7 +607,9 @@ TAO_GIOP_Message_Lite::
           // Sending back the same service context list we received in the
           // Request.  (Important for RT CORBA).
           reply_params.service_context_notowned (&request.service_info ());
+#if (TAO_HAS_MINIMUM_CORBA == 0)
           reply_params.params_ = 0;
+#endif /* TAO_HAS_MINIMUM_CORBA */
           // Make the GIOP header and Reply header
           this->write_reply_header (*this->output_,
                                     reply_params);
diff --git a/TAO/tao/PortableServer/DomainS.cpp b/TAO/tao/PortableServer/DomainS.cpp
index ccff7d1ac8c..600df8d06db 100644
--- a/TAO/tao/PortableServer/DomainS.cpp
+++ b/TAO/tao/PortableServer/DomainS.cpp
@@ -236,9 +236,8 @@ if (_tao_vfr.valid ())
       ACE_TRY_ENV
     );
 
-    CORBA::Policy_ptr  _tao_retval_info = _tao_retval._retn ();
     #if (TAO_HAS_INTERCEPTORS == 1)
-
+    CORBA::Policy_ptr  _tao_retval_info = _tao_retval._retn ();
      ri.result (_tao_retval_info);
     _tao_retval = _tao_retval_info;
     #endif /* TAO_HAS_INTERCEPTORS */
@@ -585,6 +584,10 @@ POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_p
   }
 
 #endif /* TAO_HAS_INTERCEPTORS */
+
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 class TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -1067,3 +1070,5 @@ POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_ma
   }
 
 #endif /* TAO_HAS_INTERCEPTORS && TAO_HAS_INTERFACE_REPOSITORY */
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/PortableServer/DomainS.h b/TAO/tao/PortableServer/DomainS.h
index fc32bdb54d1..b16a737062b 100644
--- a/TAO/tao/PortableServer/DomainS.h
+++ b/TAO/tao/PortableServer/DomainS.h
@@ -274,6 +274,8 @@ private:
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 class POA_CORBA_ConstructionPolicy;
 typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr;
 class TAO_PortableServer_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA::Policy
@@ -528,6 +530,7 @@ private:
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
 #include "DomainS_T.h"
 
diff --git a/TAO/tao/PortableServer/DomainS.i b/TAO/tao/PortableServer/DomainS.i
index 9c4b9957937..aa35ae2efb2 100644
--- a/TAO/tao/PortableServer/DomainS.i
+++ b/TAO/tao/PortableServer/DomainS.i
@@ -7,6 +7,8 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 ACE_INLINE void POA_CORBA_ConstructionPolicy::_get_policy_type_skel (
     CORBA::ServerRequest &req,
     void *obj,
@@ -52,3 +54,5 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::destroy_skel (
        ACE_TRY_ENV
     );
 }
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/PortableServer/DomainS_T.i b/TAO/tao/PortableServer/DomainS_T.i
index f02569b5455..4da3fa04854 100644
--- a/TAO/tao/PortableServer/DomainS_T.i
+++ b/TAO/tao/PortableServer/DomainS_T.i
@@ -103,6 +103,8 @@ CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy  (
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T &t)
@@ -238,3 +240,5 @@ void POA_CORBA_ConstructionPolicy_tie<T>::destroy  (
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 09174a39788..541b015c168 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -634,12 +634,20 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
+#if (TAO_HAS_MINIMUM_CORBA == 0)
   ACE_CATCH (PortableServer::ForwardRequest, forward_request)
     {
       forward_to =
         CORBA::Object::_duplicate (forward_request.forward_reference.in ());
       return TAO_Adapter::DS_FORWARD;
     }
+#else
+  ACE_CATCHANY
+    {
+      ACE_UNUSED_ARG (forward_to);
+      ACE_RE_THROW;
+    }
+#endif /* TAO_HAS_MINIMUM_CORBA */
   ACE_ENDTRY;
 
   return TAO_Adapter::DS_OK;
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 01850a01571..71c4fc7d175 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -87,17 +87,15 @@ private:
 
 ACE_RCSID(tao, POA, "$Id$")
 
-#if (TAO_NO_IOR_TABLE == 0)
-  // This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
-  // It's an array of octets representing ^t^a^o/0 in octal.
-  CORBA::Octet
+// This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
+// It's an array of octets representing ^t^a^o/0 in octal.
+CORBA::Octet
 TAO_POA::objectkey_prefix [TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
   024, // octal for ^t
   001, // octal for ^a
   017, // octal for ^o
   000
 };
-#endif /* TAO_NO_IOR_TABLE */
 
 TAO_POA::TAO_POA (const TAO_POA::String &name,
                   TAO_POA_Manager &poa_manager,
@@ -3857,12 +3855,11 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
   this->orb_core_.check_shutdown (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
   //
   // ImplRepo related.
   //
 #if (TAO_HAS_MINIMUM_CORBA == 0)
+  CORBA::Object_ptr obj = CORBA::Object::_nil ();
 
   if (this->use_imr_
       && this->policies_.lifespan () == PortableServer::PERSISTENT)
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 215138e8c4d..9a05810e9a0 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -454,10 +454,6 @@ TAO_NAMESPACE CORBA
   typedef CORBA_ContextList_var ContextList_var;
   typedef CORBA_ContextList_out ContextList_out;
 
-  typedef char *CORBA_FieldName;
-  typedef CORBA_String_var CORBA_FieldName_var;
-  typedef CORBA_String_out CORBA_FieldName_out;
-
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   typedef CORBA_Object Object;
@@ -827,11 +823,6 @@ TAO_NAMESPACE CORBA
   typedef WrongTransaction *WrongTransaction_ptr;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WrongTransaction;
 
-  typedef CORBA_FieldName FieldName;
-  typedef CORBA_FieldName_var FieldName_var;
-  typedef CORBA_FieldName_out FieldName_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FieldName;
-
 #endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
 
   // ****************************************************************