Fri May 21 22:09:09 1999 Irfan Pyarali <irfan@cs.wustl.edu>

16 files changed, 91 insertions, 45 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 9e194f2bb4b..ee8d875bdf4 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,4 +1,23 @@
-Fri May 21 20:58:05 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
+Fri May 21 22:09:09 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* tao: Modified the following files to make minimum CORBA work
+	  again.
+
+          - Connect.cpp
+          - DomainC.cpp
+          - DomainS.cpp
+          - ORB_Core.cpp
+          - POA.cpp
+          - POAC.h
+          - POAManager.h
+          - POAManager.i
+          - POAS.cpp
+          - PolicyS.cpp
+          - Request.cpp
+          - WrongTransactionC.cpp
+          - WrongTransactionC.h
+          - corbafwd.h
+          - orbconf.h
 
 	* examples/Simple/Simple_util.cpp (test_for_ins): Removed
 	  unnecessary bank dependencies that Vishal had added to this
diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index e85b2d7d0c6..e7ae32cee81 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -7,6 +7,7 @@
 #include "tao/GIOP.h"
 #include "tao/GIOP_Server_Request.h"
 #include "tao/ORB_Core.h"
+#include "tao/ORB.h"
 #include "tao/POA.h"
 #include "tao/CDR.h"
 
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index dab6846be8c..a65736ba3a1 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -18,6 +18,7 @@
 #include "tao/Invocation.h"
 #include "tao/varout.h"
 #include "tao/POA_CORBA.h"
+#include "tao/ORB.h"
 
 #if !defined (__ACE_INLINE__)
 #include "DomainC.i"
diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp
index b9295a32552..9e9c01aeccb 100644
--- a/TAO/tao/DomainS.cpp
+++ b/TAO/tao/DomainS.cpp
@@ -12,6 +12,7 @@
 #include "tao/Operation_Table.h"
 #include "tao/Server_Request.h"
 #include "tao/POA_CORBA.h"
+#include "tao/ORB.h"
 
 class TAO_CORBA_DomainManager_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -61,11 +62,11 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",},
       {"_is_a",  &POA_CORBA::DomainManager::_is_a_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
       {"_non_existent",  &POA_CORBA::DomainManager::_non_existent_skel},
-      {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",},
       {"get_domain_policy", 	&POA_CORBA::DomainManager::get_domain_policy_skel},
     };
 
@@ -103,9 +104,9 @@ POA_CORBA::DomainManager::~DomainManager (void)
 }
 
 void POA_CORBA::DomainManager::get_domain_policy_skel (
-    CORBA::ServerRequest &_tao_server_request, 
-    void *_tao_object_reference, 
-    void * /* context */, 
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -134,7 +135,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
 }
 
 void POA_CORBA::DomainManager::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request, 
+    CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
@@ -146,10 +147,10 @@ void POA_CORBA::DomainManager::_is_a_skel (
   CORBA::String_var value;
   if (!((_tao_in >> value.out ())))
     ACE_THROW (CORBA::MARSHAL ());
-  
+
   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply (ACE_TRY_ENV);
   ACE_CHECK;
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
@@ -158,7 +159,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
 }
 
 void POA_CORBA::DomainManager::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request, 
+    CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
@@ -167,7 +168,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
   POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply (ACE_TRY_ENV);
   ACE_CHECK;
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
@@ -303,11 +304,11 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",},
       {"_is_a",  &POA_CORBA::ConstructionPolicy::_is_a_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
       {"_non_existent",  &POA_CORBA::ConstructionPolicy::_non_existent_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",},
       {"make_domain_manager", 	&POA_CORBA::ConstructionPolicy::make_domain_manager_skel},
     };
 
@@ -346,9 +347,9 @@ POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 }
 
 void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
-    CORBA::ServerRequest &_tao_server_request, 
-    void *_tao_object_reference, 
-    void * /* context */, 
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -386,7 +387,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
 }
 
 void POA_CORBA::ConstructionPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request, 
+    CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
@@ -398,10 +399,10 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
   CORBA::String_var value;
   if (!((_tao_in >> value.out ())))
     ACE_THROW (CORBA::MARSHAL ());
-  
+
   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply (ACE_TRY_ENV);
   ACE_CHECK;
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
@@ -410,7 +411,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
 }
 
 void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request, 
+    CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
@@ -419,7 +420,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
   POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply (ACE_TRY_ENV);
   ACE_CHECK;
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
@@ -523,5 +524,3 @@ CORBA::Boolean POA_CORBA::_tao_collocated_ConstructionPolicy::_is_a (
 }
 
 #endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 4d4b8011047..a463d1adc8a 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "tao/ORB_Core.h"
+#include "tao/ORB.h"
 
 #include "ace/Env_Value_T.h"
 #include "ace/Arg_Shifter.h"
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index e5faa1c2f65..12fe314d8b6 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -5,6 +5,7 @@
 
 #include "tao/POA.h"
 #include "tao/ORB_Core.h"
+#include "tao/ORB.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Environment.h"
 #include "tao/Exception.h"
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index e56a6e13146..24cc2967911 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -2281,13 +2281,20 @@ TAO_NAMESPACE PortableServer{
 #if defined (__ACE_INLINE__)
 #include "POAC.i"
 #else
+
 // POA's policies.
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
 CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); //
 CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
 CORBA::Boolean TAO_Export
 operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicy_ptr );
 CORBA::Boolean TAO_Export
 operator>> (TAO_InputCDR &, PortableServer::ThreadPolicy_ptr &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); //
 CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
 CORBA::Boolean TAO_Export
@@ -2306,6 +2313,9 @@ CORBA::Boolean TAO_Export
 operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicy_ptr );
 CORBA::Boolean TAO_Export
 operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicy_ptr &);
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
 CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); //
 CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
 CORBA::Boolean TAO_Export
@@ -2325,22 +2335,36 @@ operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicy_ptr )
 CORBA::Boolean TAO_Export
 operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicy_ptr &);
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 // POA's exceptions.
 void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&);
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
 void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterInactive &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterInactive*); // noncopying version
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterInactive *&);
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterNonExistent *&);
 void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPolicy &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&);
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
 void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&);
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version
 void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ObjectAlreadyActive *&);
diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h
index d4dea0e2eaf..e3b71040452 100644
--- a/TAO/tao/POAManager.h
+++ b/TAO/tao/POAManager.h
@@ -72,10 +72,10 @@ protected:
                      CORBA::Boolean wait_for_completion,
                      CORBA_Environment &ACE_TRY_ENV);
 
-  PortableServer::POAManager::State get_state_i ();
-
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
+  PortableServer::POAManager::State get_state_i ();
+
   ACE_Lock &lock (void);
 
   int remove_poa (TAO_POA *poa);
diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i
index 43cd7d77d3a..c8ce24fe58a 100644
--- a/TAO/tao/POAManager.i
+++ b/TAO/tao/POAManager.i
@@ -52,6 +52,8 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
                       ACE_TRY_ENV);
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 ACE_INLINE PortableServer::POAManager::State
 TAO_POA_Manager::get_state_i (void)
 {
@@ -66,5 +68,3 @@ TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV)
 
   return this->get_state_i ();
 }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index 492a9fb46b5..a7b9ade3008 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -11,6 +11,7 @@
 #include "tao/Server_Request.h"
 #include "tao/Operation_Table.h"
 #include "tao/ORB_Core.h"
+#include "tao/ORB.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/POAS.i"
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index 69351123a13..079873eade6 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -14,6 +14,7 @@
 #include "tao/POA_CORBA.h"
 #include "tao/Environment.h"
 #include "tao/Typecode.h"
+#include "tao/ORB.h"
 
 ACE_RCSID(tao, PolicyS, "$Id$")
 
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
index 519ee4c479a..4a76a26c868 100644
--- a/TAO/tao/Request.cpp
+++ b/TAO/tao/Request.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "tao/Request.h"
-#include "tao/Sequence_T.h"
+
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #include "tao/Object.h"
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 6458a5bb877..e85873c1b2a 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -8,9 +8,9 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
+#include "tao/WrongTransactionC.h"
 
-#include "WrongTransactionC.h"
+#if !defined (TAO_HAS_MINIMUM_CORBA)
 
 // default constructor
 CORBA_WrongTransaction::CORBA_WrongTransaction (void)
@@ -39,7 +39,7 @@ CORBA_WrongTransaction::operator= (const CORBA_WrongTransaction &_tao_excp)
 }
 
 // narrow
-CORBA_WrongTransaction_ptr 
+CORBA_WrongTransaction_ptr
 CORBA_WrongTransaction::_narrow (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_id ())) // same type
@@ -60,6 +60,4 @@ CORBA::Exception *CORBA_WrongTransaction::_alloc (void)
   return new CORBA_WrongTransaction;
 }
 
-#endif /* ! defined TAO_HAS_MINIMUM_CORBA */
-
-
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index fde14558f42..580b5885ff0 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -21,13 +21,13 @@
 #ifndef TAO_IDL_WRONG_TRANSACTIONC_H
 #define TAO_IDL_WRONG_TRANSACTIONC_H
 
-#include "tao/corbafwd.h"
+#include "tao/orbconf.h"
 
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
+#if !defined (TAO_HAS_MINIMUM_CORBA)
 
+#include "tao/corbafwd.h"
 #include "tao/Exception.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -36,7 +36,7 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO 
+#define TAO_EXPORT_MACRO
 #if defined(_MSC_VER)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
@@ -51,7 +51,7 @@ class TAO_Export CORBA_WrongTransaction : public CORBA::UserException
 //   associated with a transaction and is found to have an
 //   error in its parameters when checked at runtime (invocation).
 public:
-    
+
   CORBA_WrongTransaction (void); // default ctor
   CORBA_WrongTransaction (const CORBA_WrongTransaction &); // copy ctor
   ~CORBA_WrongTransaction (void); // dtor
@@ -72,6 +72,6 @@ public:
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
-#endif /* ! defined TAO_HAS_MINIMUM_CORBA */
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
 #endif /* ifndef TAO_IDL_WRONG_TRANSACTIONC_H */
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index cad767c234f..46305700add 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -795,6 +795,8 @@ TAO_SYSTEM_EXCEPTION_LIST
   typedef CORBA_DomainManagerList_out DomainManagerList_out;
   static CORBA::TypeCode_ptr _tc_DomainManagerList;
 
+  static const PolicyType SecConstruction;
+
 #if ! defined (TAO_HAS_MINIMUM_CORBA)
   typedef CORBA_ConstructionPolicy ConstructionPolicy;
   typedef CORBA_ConstructionPolicy *ConstructionPolicy_ptr;
@@ -802,8 +804,6 @@ TAO_SYSTEM_EXCEPTION_LIST
   typedef CORBA_ConstructionPolicy_out ConstructionPolicy_out;
   static CORBA::TypeCode_ptr _tc_ConstructionPolicy;
 
-  static const PolicyType SecConstruction;
-
   typedef CORBA_WrongTransaction WrongTransaction;
   typedef WrongTransaction *WrongTransaction_ptr;
   static CORBA::TypeCode_ptr _tc_WrongTransaction;
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 20418a759f6..8e65ded9771 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -288,7 +288,7 @@
 #define TAO_HAS_VALUETYPE
 
 // Minimum CORBA
-// #define TAO_HAS_MINIMUM_CORBA
+#define TAO_HAS_MINIMUM_CORBA
 
 // CORBA Messaging
 #if defined(ACE_WIN32)