diff options
| author | msmit <msmit@remedy.nl> | 2011-12-02 15:58:47 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2011-12-02 15:58:47 +0000 |
| commit | 7e7714d3b45b428eaeddf299a9e62ba3ed594ad9 (patch) | |
| tree | 44ad7078a04272156fe61d5ee26dbc8ae404ded6 | |
| parent | 1f6e3f29348e7c1c388e6d228bd6c535d8118808 (diff) | |
| download | ATCD-7e7714d3b45b428eaeddf299a9e62ba3ed594ad9.tar.gz | |
Fri Dec 2 15:57:52 UTC 2011 Marcel Smit <msmit@remedy.nl>
* TAO_IDL/be/be_provides.cpp:
* TAO_IDL/be/be_visitor_component/context_svth.cpp:
* TAO_IDL/be/be_visitor_component/context_svts.cpp:
No multiple inheritance so no virtual needed.
| -rw-r--r-- | TAO/ChangeLog.BRANCH | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_provides.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH index 7e744a8516f..886ce5ec2e2 100644 --- a/TAO/ChangeLog.BRANCH +++ b/TAO/ChangeLog.BRANCH @@ -1,3 +1,10 @@ +Fri Dec 2 15:57:52 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_component/context_svth.cpp: + * TAO_IDL/be/be_visitor_component/context_svts.cpp: + No multiple inheritance so no virtual needed. + Fri Dec 2 14:59:28 UTC 2011 Marcel Smit <msmit@remedy.nl> * TAO_IDL/be/be_codegen.cpp: diff --git a/TAO/TAO_IDL/be/be_provides.cpp b/TAO/TAO_IDL/be/be_provides.cpp index 938c66559b4..707f80af9cf 100644 --- a/TAO/TAO_IDL/be/be_provides.cpp +++ b/TAO/TAO_IDL/be/be_provides.cpp @@ -77,7 +77,7 @@ be_provides::gen_facet_svnt_tmpl_decl (TAO_OutStream &os) os << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl << "class " << lname << "_Servant_T" << be_idt_nl - << ": public virtual ::CIAO::Facet_Servant_Base_T<BASE, EXEC, " + << ": public ::CIAO::Facet_Servant_Base_T<BASE, EXEC, " << "CONTEXT>" << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp index d525dfe2a2c..036200da0ee 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp @@ -65,7 +65,7 @@ be_visitor_context_svth::visit_component (be_component *node) } else { - os_ << ": public virtual BASE"; + os_ << ": public BASE"; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp index f724511bebc..45a49f841de 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp @@ -12,6 +12,7 @@ * @author Jeff Parsons */ //============================================================================= +#include <be_helper.h> be_visitor_context_svts::be_visitor_context_svts (be_visitor_context *ctx) : be_visitor_component_scope (ctx) @@ -48,6 +49,7 @@ be_visitor_context_svts::visit_component (be_component *node) << "const char *id)" << be_uidt_nl << ": ::CIAO::Context_Impl_Base_T <CONTAINER_TYPE> (h, c, id)," << be_idt_nl; + // Spec: no multiple inheritance allowed for components. AST_Component * base = node->base_component (); if (base) |