diff options
| -rw-r--r-- | CIAO/ChangeLog | 14 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl | 3 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp | 2 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_IDL2/basic_visitor.h | 1 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h | 4 |
5 files changed, 19 insertions, 5 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index fbc154a72a9..f416d1bdc25 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,17 @@ +Wed Jun 2 17:02:20 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tools/IDL3_to_IDL2/basic_visitor.cpp: + * tools/IDL3_to_IDL2/basic_visitor.h: + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: + + Added support for generation of port name as part + of an attribute name originating in a porttype. + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + + Uncommented test case added by Johnny Willemsen + <jwillemsen at remedy dot nl>. + Wed Jun 2 13:50:42 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl index 432ae2642e9..c4352514d0b 100644 --- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl +++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl @@ -158,8 +158,7 @@ module T component Z { port Y myport; -// Jeff, enable this one to get a compile problem -// port Y mysecondport; + port Y mysecondport; }; }; }; diff --git a/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp index 1a221a96f1e..e0c389b7771 100644 --- a/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp +++ b/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp @@ -1064,7 +1064,7 @@ basic_visitor::gen_attribute (AST_Attribute *node) *os << be_nl << be_nl << (rd_only ? "readonly " : "") << "attribute "; *os << this->type_name (node->field_type ()); - *os << " " + *os << " " << this->port_prefix_.c_str () << IdentifierHelper::try_escape (node->original_local_name ()).c_str (); this->gen_exception_list (node->get_get_exceptions (), diff --git a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h index b005e209d8b..7bda9a21555 100644 --- a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h +++ b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h @@ -109,6 +109,7 @@ protected: protected: TAO_OutStream *os; AST_Type *disc_type_; + ACE_CString port_prefix_; private: ACE_CString tmp_retval_; diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h index 0dace676f12..5edd1656f5f 100644 --- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h +++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h @@ -29,7 +29,8 @@ #include "TAO_IDL3_TO_IDL2_BE_Export.h" -class TAO_IDL3_TO_IDL2_BE_Export idl3_to_idl2_visitor : public basic_visitor +class TAO_IDL3_TO_IDL2_BE_Export idl3_to_idl2_visitor + : public basic_visitor { // // = TITLE @@ -81,7 +82,6 @@ private: private: AST_Home *home_; - ACE_CString port_prefix_; }; #endif /* TAO_IDL3_TO_IDL2_VISITOR_H */ |