diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-12 13:14:55 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-12 13:14:55 +0000 |
| commit | c60658cd99cd56a43629804b80ea026129104086 (patch) | |
| tree | fbc4ffe02f1c30d0ff904c2946017f1901fbe84b /TAO/TAO_IDL/be/be_visitor_connector | |
| parent | 9e4a192e6286a2978c64d34debca7ea0d55847dc (diff) | |
| download | ATCD-c60658cd99cd56a43629804b80ea026129104086.tar.gz | |
Fri Nov 12 13:10:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
Changed dds_traits
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_connector')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index ef9b8e0e9e5..9466fc3dcd4 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -154,6 +154,9 @@ be_visitor_connector_dds_exh::gen_dds_traits (void) AST_Decl *comp_scope = ScopeAsDecl (this->node_->defined_in ()); + bool global_comp = + (comp_scope->node_type () == AST_Decl::NT_root); + UTL_ScopedName *dt_name = (*datatype)->name (); BE_GlobalData::DDS_IMPL the_dds_impl = be_global->dds_impl (); @@ -180,10 +183,10 @@ be_visitor_connector_dds_exh::gen_dds_traits (void) << "DataWriter datawriter_type;" << be_nl << "typedef ::" << dt_name << "DataReader datareader_type;" << be_nl - << "typedef ::" << comp_scope->full_name () - << "::DataWriter typed_writer_type;" << be_nl - << "typedef ::" << comp_scope->full_name () - << "::DataReader typed_reader_type;" << be_uidt_nl + << "typedef " << (global_comp ? "" : "::") << comp_scope->full_name () + << "::DDS_Typed_Entity::DataWriter typed_writer_type;" << be_nl + << "typedef " << (global_comp ? "" : "::") << comp_scope->full_name () + << "::DDS_Typed_Entity::DataReader typed_reader_type;" << be_uidt_nl << "};"; } } |