diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-08-21 16:49:16 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-08-21 16:49:16 +0000 |
| commit | 97796ef3f0876582ca22ae261a23b06214693420 (patch) | |
| tree | e6c35d7a928860a93ce5b19bd69147b71960886e | |
| parent | 4130ebb20b218b68a949953ed69fb8b85b69131c (diff) | |
| download | ATCD-97796ef3f0876582ca22ae261a23b06214693420.tar.gz | |
ChangeLogTag: Fri Aug 21 16:47:57 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | modules/TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | modules/TAO/TAO_IDL/be/be_instantiated_connector.cpp | 3 | ||||
| -rw-r--r-- | modules/TAO/TAO_IDL/be_include/be_instantiated_connector.h | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog index 10ae0ff192a..53c464162a9 100644 --- a/modules/TAO/ChangeLog +++ b/modules/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Aug 21 16:47:57 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_instantiated_connector.cpp: + * TAO_IDL/be_include/be_instantiated_connector.h: + + Added be_type to the inheritance so typedef narrowing + works properly. + Fri Aug 21 16:29:35 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/fe/idl.yy: diff --git a/modules/TAO/TAO_IDL/be/be_instantiated_connector.cpp b/modules/TAO/TAO_IDL/be/be_instantiated_connector.cpp index 0255bea9791..bcf9488e59c 100644 --- a/modules/TAO/TAO_IDL/be/be_instantiated_connector.cpp +++ b/modules/TAO/TAO_IDL/be/be_instantiated_connector.cpp @@ -19,6 +19,8 @@ be_instantiated_connector::be_instantiated_connector ( AST_Instantiated_Connector (n, connector_type, template_args), + be_type (AST_Decl::NT_connector, + n), be_scope (AST_Decl::NT_connector) { } @@ -31,6 +33,7 @@ void be_instantiated_connector::destroy (void) { this->AST_Instantiated_Connector::destroy (); + this->be_type::destroy (); this->be_scope::destroy (); } diff --git a/modules/TAO/TAO_IDL/be_include/be_instantiated_connector.h b/modules/TAO/TAO_IDL/be_include/be_instantiated_connector.h index f3c1ceace5b..d2ce5455e51 100644 --- a/modules/TAO/TAO_IDL/be_include/be_instantiated_connector.h +++ b/modules/TAO/TAO_IDL/be_include/be_instantiated_connector.h @@ -6,10 +6,12 @@ #include "ast_instantiated_connector.h" +#include "be_type.h" #include "be_scope.h" class be_instantiated_connector : public virtual AST_Instantiated_Connector, + public virtual be_type, public virtual be_scope { public: |