diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-21 23:50:51 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-21 23:50:51 +0000 |
| commit | 461263cdb96da7f4d18676b5bf0791edaef4e9c5 (patch) | |
| tree | 66ffb4c6c40853f98a0f5e9cd3d1a0a9b7f4d508 | |
| parent | 95a7b0ccd83a2fcf7cae621a567e2d3a61ffbb05 (diff) | |
| download | ATCD-461263cdb96da7f4d18676b5bf0791edaef4e9c5.tar.gz | |
ChangeLogTag:Wed Jan 21 17:35:20 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_args.cpp | 43 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface.cpp | 2 |
3 files changed, 22 insertions, 33 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 4d39fd94e79..66034530eb7 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,13 @@ +Wed Jan 21 17:35:20 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * TAO_IDL/be/be_visitor_interface.cpp: + Generate CORBA_Object instead of CORBA::Object to keep NT + happy. + + * TAO_IDL/be/be_visitor_args.cpp: + Fixed mapping for strings as arguments, they should always be + char*. + Mon Jan 19 22:03:38 1998 <coryan@MILONGA> * tao/sequence_T.i: diff --git a/TAO/TAO_IDL/be/be_visitor_args.cpp b/TAO/TAO_IDL/be/be_visitor_args.cpp index af578c71ae4..c0bc5ba43bf 100644 --- a/TAO/TAO_IDL/be/be_visitor_args.cpp +++ b/TAO/TAO_IDL/be/be_visitor_args.cpp @@ -222,40 +222,19 @@ int be_visitor_args_decl::visit_sequence (be_sequence *node) return this->dump_structure (); } -int be_visitor_args_decl::visit_string (be_string *node) +int be_visitor_args_decl::visit_string (be_string *) { - if (this->current_type_name_ == node->name ()) - { - // Strings have special mapping, the <name> returned by - // be_string is not useful for this. - - switch (this->argument_direction_) - { - case AST_Argument::dir_IN: - this->stream () << "const char*"; - break; - case AST_Argument::dir_INOUT: - this->stream () << "char*"; - break; - case AST_Argument::dir_OUT: - this->stream () << "CORBA::String_out"; - break; - } - } - else + switch (this->argument_direction_) { - switch (this->argument_direction_) - { - case AST_Argument::dir_IN: - this->stream () << "const " << this->current_type_name_; - break; - case AST_Argument::dir_INOUT: - this->stream () << this->current_type_name_; - break; - case AST_Argument::dir_OUT: - this->stream () << this->current_type_name_ << "_out"; - break; - } + case AST_Argument::dir_IN: + this->stream () << "const char*"; + break; + case AST_Argument::dir_INOUT: + this->stream () << "char*"; + break; + case AST_Argument::dir_OUT: + this->stream () << "CORBA::String_out"; + break; } return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp index 48df6887f26..c9cdc92dc02 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp @@ -272,7 +272,7 @@ int be_visitor_collocated_ss::visit_interface (be_interface *node) } } - *ss << " CORBA::Object (stub, servant, CORBA::B_TRUE)," << be_nl + *ss << " CORBA_Object (stub, servant, CORBA::B_TRUE)," << be_nl << " servant_ (servant)"; *ss << "\n"; |