diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-22 20:41:44 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-22 20:41:44 +0000 |
| commit | 3d4a031d6379b1193b142792ebfd466d394bae7a (patch) | |
| tree | bf9a9e7a16570de2e996fef812cbd0d8162ca1da | |
| parent | f8d98275cf4eaae74055d4998dc24aa40501bcb3 (diff) | |
| download | ATCD-3d4a031d6379b1193b142792ebfd466d394bae7a.tar.gz | |
ChangeLogTag:Thu Jan 22 14:40:01 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/corbacom.h | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index b372ab0a593..b51a828cdd2 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,13 @@ +Thu Jan 22 14:40:01 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/corbacom.h: + Fixed multiple definitions of ORB_var and ORB_out due to a + simplistic merge. + + * TAO_IDL/be/be_interface.cpp: + Generate _find() to locate operations; using just find() is not + complaint. + Thu Jan 22 10:40:13 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * Merged changes from main_to_poa_merge_10 up to diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 1d899875f31..a8e506be146 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -926,7 +926,7 @@ int be_interface::gen_server_skeletons (void) *ss << "CORBA::String opname = req.op_name (); // retrieve operation name" << nl; *ss << "// find the skeleton corresponding to this opname" << nl; - *ss << "if (this->find (opname, skel) == -1)" << nl; + *ss << "if (this->_find (opname, skel) == -1)" << nl; *ss << "{\n"; ss->incr_indent (); *ss << "env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));" << diff --git a/TAO/tao/corbacom.h b/TAO/tao/corbacom.h index ae6d6ce4328..7bb87596390 100644 --- a/TAO/tao/corbacom.h +++ b/TAO/tao/corbacom.h @@ -80,9 +80,6 @@ class CORBA_Object_var; class CORBA_Object_out; //typedef class CORBA_Object *CORBA_Object_ptr; -class CORBA_ORB_var; -class CORBA_ORB_out; - class CORBA_ServerRequest; //typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr; @@ -446,9 +443,6 @@ public: typedef CORBA_Object_var Object_var; typedef CORBA_Object_out Object_out; - typedef CORBA_ORB_var ORB_var; - typedef CORBA_ORB_out ORB_out; - typedef CORBA_Principal Principal; typedef CORBA_Principal *Principal_ptr; |