diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-17 19:55:49 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-17 19:55:49 +0000 |
| commit | bc7a92ff48c10e411119dccc3bdf07f2ac7fff80 (patch) | |
| tree | 4654e1bbf57976142f818f17cb93e0de8358cfff | |
| parent | b435f41ae8fb8619c49b8b6ed052e717b498c01d (diff) | |
| download | ATCD-bc7a92ff48c10e411119dccc3bdf07f2ac7fff80.tar.gz | |
ChangeLogTag: Thu Dec 17 19:52:18 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | modules/CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp | 7 | ||||
| -rw-r--r-- | modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp | 6 |
3 files changed, 17 insertions, 6 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index 3ba090af1ed..8e813bb92c7 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Dec 17 19:52:18 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tools/IDL3_to_IDL2/basic_visitor.cpp: + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: + + Changes needed to this back end required by front end + changes made to support IDL template parameters as + base interfaces/valuetypes, supported interfaces, and + primary keys. + Thu Dec 17 19:37:41 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: diff --git a/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp b/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp index 7cba018097b..5c6e06169a0 100644 --- a/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp +++ b/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp @@ -19,6 +19,7 @@ #include "ast_sequence.h" #include "ast_string.h" #include "ast_structure_fwd.h" +#include "ast_typedef.h" #include "ast_union.h" #include "ast_union_branch.h" #include "ast_union_fwd.h" @@ -185,7 +186,7 @@ basic_visitor::visit_valuetype (AST_ValueType *node) << IdentifierHelper::try_escape (node->original_local_name ()).c_str (); AST_Decl::NodeType nt = node->node_type (); - AST_Interface **parents = node->inherits (); + AST_Type **parents = node->inherits (); long ninherits = node->n_inherits (); long i = 0; @@ -209,7 +210,7 @@ basic_visitor::visit_valuetype (AST_ValueType *node) << "Components::EventBase"; } - AST_Interface **supports = node->supports (); + AST_Type **supports = node->supports (); for (i = 0; i < node->n_supports (); ++i) { @@ -227,7 +228,7 @@ basic_visitor::visit_valuetype (AST_ValueType *node) supports[i] = node->supports_concrete (); } - AST_Interface *supported = supports[i]; + AST_Type *supported = supports[i]; *os << IdentifierHelper::orig_sn (supported->name ()).c_str (); } diff --git a/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp index 5327816dd6f..69aa084c186 100644 --- a/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp +++ b/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp @@ -87,7 +87,7 @@ idl3_to_idl2_visitor::visit_interface (AST_Interface *node) *os << "interface " << IdentifierHelper::try_escape (node->original_local_name ()).c_str (); - AST_Interface **parents = node->inherits (); + AST_Type **parents = node->inherits (); for (long i = 0; i < node->n_inherits (); ++i) { @@ -370,7 +370,7 @@ idl3_to_idl2_visitor::visit_eventtype (AST_EventType *node) *os << be_nl << be_nl << "interface " << node->original_local_name () << "Consumer : "; - AST_Interface *parent = 0; + AST_Type *parent = 0; AST_Decl::NodeType nt = AST_Decl::NT_native; if (node->n_inherits () > 0) @@ -485,7 +485,7 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node) delete sn; sn = 0; - AST_ValueType *key = node->primary_key (); + AST_Type *key = node->primary_key (); ACE_CString mng_name = IdentifierHelper::orig_sn (node->managed_component ()->name ()); ACE_CString key_name; |