ChangeLogTag:Fri Mar 19 19:15:56 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

7 files changed, 72 insertions, 66 deletions

diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
index 79d20c6f21f..7eb4109f340 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
@@ -20,20 +20,20 @@ static const TAO_operation_db_entry Marshal_operations[] = {
 };
 
 TAO_Dynamic_Hash_OpTable tao_Marshal_optable(Marshal_operations, 10,
-					     // 9 + 1 operations on our 
-					     // interface 
+					     // 9 + 1 operations on our
+					     // interface
 					     20);
 // constructor
 _skel_Marshal::_skel_Marshal (const char *obj_name)
 {
   const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID
-  IIOP_Object *data;  // IIOP object 
+  STUB_Object *data;  // IIOP object
   CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
   this->optable_ = &tao_Marshal_optable;     // operation database
   CORBA_Long i;
 
   // setup an IIOP object
-  data = new IIOP_Object (CORBA_string_dup (repoID));
+  data = new STUB_Object (CORBA_string_dup (repoID));
   data->profile.iiop_version.major = IIOP::MY_MAJOR;
   data->profile.iiop_version.minor = IIOP::MY_MINOR;
   data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
@@ -49,8 +49,8 @@ _skel_Marshal::_skel_Marshal (const char *obj_name)
 }
 
 // skeletons
-void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req,
+					     CORBA_Object_ptr obj,
 					     CORBA_Environment &env)
 {
 #if 0
@@ -85,50 +85,50 @@ void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req,
   // byte_order, consume_buf = 0, instance of our marshal factory
 }
 
-void _skel_Marshal::_Marshal_test_long_skel(CORBA_ServerRequest &req, 
-					    CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_long_skel(CORBA_ServerRequest &req,
+					    CORBA_Object_ptr obj,
 					    CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_octet_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_octet_skel(CORBA_ServerRequest &req,
+					     CORBA_Object_ptr obj,
 					     CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_char_skel(CORBA_ServerRequest &req, 
-					    CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_char_skel(CORBA_ServerRequest &req,
+					    CORBA_Object_ptr obj,
 					    CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_double_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_double_skel(CORBA_ServerRequest &req,
+					      CORBA_Object_ptr obj,
 					      CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_struct_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_struct_skel(CORBA_ServerRequest &req,
+					      CORBA_Object_ptr obj,
 					      CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_union_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_union_skel(CORBA_ServerRequest &req,
+					     CORBA_Object_ptr obj,
 					     CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_any_skel(CORBA_ServerRequest &req, 
-					   CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_any_skel(CORBA_ServerRequest &req,
+					   CORBA_Object_ptr obj,
 					   CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
+void _skel_Marshal::_Marshal_test_sequence_skel(CORBA_ServerRequest &req,
+						CORBA_Object_ptr obj,
 						CORBA_Environment &env)
 {
 }
@@ -169,4 +169,3 @@ void _skel_Marshal::_Marshal_is_a_skel (
   req.result (any, env);
   dexc (env, "_is_a, result");
 }
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
index 60a6f42eac6..cdf7e4541ee 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
@@ -100,7 +100,7 @@ Marshal_SSI_Impl::test_any (const CORBA_Any &a1,
   a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy
 }
 
-void 
+void
 Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
 				 Marshal::AnySeq *& as2,
 			      CORBA_Environment &env)
@@ -109,7 +109,7 @@ Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
 }
 
 #if 0
-void 
+void
 Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
 				  Marshal::Marshal_Recursive *&mr2,
 			      CORBA_Environment &env)
@@ -147,13 +147,13 @@ Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA_ORB_ptr orb, const char *obj_name)
   // cleanly integrate ourselves with the dispatch mechanism of the OA.
 
   const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID
-  IIOP_Object *data;  // IIOP object 
+  STUB_Object *data;  // IIOP object
   CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
   this->optable_ = &tao_Marshal_DSI_optable;     // operation database
   CORBA_Long i;
 
   // setup an IIOP object
-  data = new IIOP_Object (CORBA_string_dup (repoID));
+  data = new STUB_Object (CORBA_string_dup (repoID));
   data->profile.iiop_version.major = IIOP::MY_MAJOR;
   data->profile.iiop_version.minor = IIOP::MY_MINOR;
   data->profile.host = ACE_OS::strdup (oa->get_addr ().get_host_name ());
@@ -203,8 +203,8 @@ Marshal_DSI_Impl::invoke (CORBA_ServerRequest& req, CORBA_Environment &env)
 }
 
 // simulate the skeletons
-void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req,
+						CORBA_Object_ptr obj,
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr		nvlist;
@@ -238,8 +238,8 @@ void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req,
   dexc (env, "_is_a, result");
 }
 
-void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req,
+						CORBA_Object_ptr obj,
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -271,8 +271,8 @@ void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req,
+						CORBA_Object_ptr obj,
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -304,8 +304,8 @@ void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req,
+						CORBA_Object_ptr obj,
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -337,8 +337,8 @@ void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req, 
-					       CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req,
+					       CORBA_Object_ptr obj,
 					       CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -370,8 +370,8 @@ void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req,
+						CORBA_Object_ptr obj,
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -403,8 +403,8 @@ void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req,
+						CORBA_Object_ptr obj,
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -443,8 +443,8 @@ void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req,
   //  req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req,
+						CORBA_Object_ptr obj,
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -477,8 +477,8 @@ void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req,
   //  req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req,
+					      CORBA_Object_ptr obj,
 					      CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -510,8 +510,8 @@ void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req,
   //  req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, 
-						   CORBA_Object_ptr obj, 
+void Marshal_DSI_Impl::_Marshal_test_sequence_skel(CORBA_ServerRequest &req,
+						   CORBA_Object_ptr obj,
 						   CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -635,7 +635,7 @@ Marshal_DSI_Impl::test_any (const CORBA_Any &a1,
   a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy
 }
 
-void 
+void
 Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
 				 Marshal::AnySeq *& as2,
 				 CORBA_Environment &env)
@@ -644,11 +644,10 @@ Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
 }
 
 #if 0
-void 
+void
 Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
 				  Marshal::Marshal_Recursive *&mr2,
 				  CORBA_Environment &env)
 {
 }
 #endif
-
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 648af6b878a..b86bab0787a 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,13 @@
+Fri Mar 19 19:15:56 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/Stub.h:
+	* tao/IIOP_ORB.h:
+	* Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp:
+	* Benchmark/Marshal_Test/TAO/marshalS.cpp:
+	* orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
+	* utils/catior/catior.cpp:
+	  Removed last references to IIOP_Object.
+
 Fri Mar 19 17:55:47 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* tao/CurrentC.h:
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index cfa812a449f..179cd455feb 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -26,7 +26,7 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
                              CORBA::Environment &ACE_TRY_ENV)
 {
   Implementation_Repository::INET_Addr *new_addr;
-  IIOP_Object *new_iiop_obj = 0;
+  STUB_Object *new_stub_obj = 0;
 
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -39,11 +39,11 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
       new_addr = this->activate_server (0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      IIOP_Object *iiop_obj = ACE_dynamic_cast (IIOP_Object *,
+      STUB_Object *stub_obj = ACE_dynamic_cast (STUB_Object *,
                                                 obj->_stubobj ());
       TAO_IIOP_Profile *iiop_pfile =
                 ACE_dynamic_cast (TAO_IIOP_Profile *,
-                                  iiop_obj->profile_in_use ());
+                                  stub_obj->profile_in_use ());
 
       TAO_IIOP_Profile *new_pfile;
       // @@ Would new_addr->host_ be different from object_addr()?
@@ -59,11 +59,11 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
       new_pfile->object_addr (&iiop_pfile->object_addr ());
 
       // create new obj, pfile will be copied!
-      new_iiop_obj = new IIOP_Object (iiop_obj->type_id, new_pfile);
+      new_stub_obj = new STUB_Object (stub_obj->type_id, new_pfile);
 
       delete new_pfile;
 
-      if (new_iiop_obj == 0)
+      if (new_stub_obj == 0)
         return 0;
     }
   ACE_CATCHANY
@@ -71,10 +71,10 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
       ACE_RETHROW;
     }
   ACE_ENDTRY;
-  
+
   ACE_CHECK_RETURN (0);
 
-  return new CORBA_Object (new_iiop_obj,
+  return new CORBA_Object (new_stub_obj,
                            obj->_servant ());
 }
 
@@ -356,7 +356,7 @@ ImplRepo_i::server_is_running (const char *server,
       ACE_ERROR ((LM_ERROR,
                  "Error: While updating Repository while server_is_running () %s\n",
                  server));
-      return new_addr;  
+      return new_addr;
     }
 
   if (this->debug_level_ >= 2)
@@ -682,7 +682,7 @@ IR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
     }
   ACE_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR, "IR_Adapter_Activator::unknown_adapter - %s\n", exception_message)); 
+      ACE_ERROR ((LM_ERROR, "IR_Adapter_Activator::unknown_adapter - %s\n", exception_message));
       ACE_TRY_ENV.print_exception ("SYS_EX");
       return 0;
     }
@@ -760,12 +760,12 @@ IR_Forwarder::invoke (CORBA::ServerRequest_ptr /* request */,
                                    0,
                                    ACE_TRY_ENV);
 
-  IIOP_Object *iiop_obj = ACE_dynamic_cast (IIOP_Object *,
+  STUB_Object *stub_obj = ACE_dynamic_cast (STUB_Object *,
                                             forward_object->_stubobj ());
 
   TAO_IIOP_Profile *iiop_pfile =
             ACE_dynamic_cast (TAO_IIOP_Profile *,
-                              iiop_obj->profile_in_use ());
+                              stub_obj->profile_in_use ());
 
   iiop_pfile->port (new_addr->port_);
   iiop_pfile->host (new_addr->host_);
diff --git a/TAO/tao/IIOP_ORB.h b/TAO/tao/IIOP_ORB.h
index 17e29d7733f..dd3b56b9b94 100644
--- a/TAO/tao/IIOP_ORB.h
+++ b/TAO/tao/IIOP_ORB.h
@@ -29,8 +29,9 @@ class TAO_Export IIOP_ORB : public CORBA_ORB
   //    Bridge implementation of <IIOP_ORB>.
   //
   // = DESCRIPTION
-  //    This is one of the two main hooks into IIOP in this C/C++
-  //    based implementation; the other being <IIOP_Object>.
+  //   Just implement some IIOP aspects of the ORB. This will be
+  //   removed as the pluggable protocols changes are propagated.
+  //
 public:
   IIOP_ORB (void);
   // constructor
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index cec067cc9cd..a425d7484e3 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -38,8 +38,6 @@
 class TAO_GIOP_Invocation;
 class TAO_ORB_Core;
 
-typedef STUB_Object IIOP_Object;
-
 // Descriptions of parameters.
 
 enum TAO_Param_Type
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index d1783899a61..865041a2792 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -201,7 +201,6 @@ catior (CORBA::String str,
   // we unmarshal objrefs.
 
   CORBA::ULong profiles = 0;
-  // IIOP_Object *objdata = 0;
 
   continue_decoding = stream.read_ulong (profiles);