diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-19 14:45:51 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-19 14:45:51 +0000 |
| commit | e9a3c00c7de43397346ee1781ff7df38a026c3eb (patch) | |
| tree | 0e7fc4b48808a6ea892ac614ef12f3b774089620 | |
| parent | 99473451946125b2e4d2ea0bf52f9dcdc46cb30d (diff) | |
| download | ATCD-e9a3c00c7de43397346ee1781ff7df38a026c3eb.tar.gz | |
ChangeLogTag: Thu Nov 19 14:43:01 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | modules/TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | modules/TAO/TAO_IDL/fe/idl.yy | 7 | ||||
| -rw-r--r-- | modules/TAO/TAO_IDL/fe/y.tab.cpp | 11 |
3 files changed, 15 insertions, 10 deletions
diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog index 5fca0cf4ecc..57510d8a9fd 100644 --- a/modules/TAO/ChangeLog +++ b/modules/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 19 14:43:01 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Fixed typos in generated file. + Thu Nov 19 14:23:09 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/ast/ast_expression.cpp: diff --git a/modules/TAO/TAO_IDL/fe/idl.yy b/modules/TAO/TAO_IDL/fe/idl.yy index 4cbdca8976b..31286152074 100644 --- a/modules/TAO/TAO_IDL/fe/idl.yy +++ b/modules/TAO/TAO_IDL/fe/idl.yy @@ -6179,7 +6179,7 @@ extended_port_decl else { FE_Utils::T_PARAMLIST_INFO *p_list = - pt->formal_parameters (); + pt->template_params (); if (p_list != 0 && p_list->size () != 0) { @@ -6261,7 +6261,7 @@ extended_port_decl else { FE_Utils::T_PARAMLIST_INFO *p_list = - pt->formal_parameters (); + pt->template_params (); if (p_list != 0 && p_list->size () != 0) { @@ -6378,8 +6378,7 @@ connector_header { AST_Connector *c = idl_global->gen ()->create_connector (&sn, - parent, - $3); + parent); (void) s->fe_add_connector (c); diff --git a/modules/TAO/TAO_IDL/fe/y.tab.cpp b/modules/TAO/TAO_IDL/fe/y.tab.cpp index 222daf80ed5..5d07c828318 100644 --- a/modules/TAO/TAO_IDL/fe/y.tab.cpp +++ b/modules/TAO/TAO_IDL/fe/y.tab.cpp @@ -927,8 +927,8 @@ static const tao_yytype_uint16 tao_yyrline[] = 5969, 5975, 5979, 5997, 5996, 6018, 6025, 6039, 6046, 6070, 6077, 6088, 6093, 6098, 6103, 6087, 6118, 6125, 6130, 6137, 6136, 6145, 6144, 6155, 6237, 6300, 6304, 6305, 6309, 6323, - 6328, 6333, 6327, 6394, 6399, 6393, 6414, 6418, 6419, 6424, - 6423, 6434, 6433, 6444, 6443, 6454, 6453 + 6328, 6333, 6327, 6393, 6398, 6392, 6413, 6417, 6418, 6423, + 6422, 6433, 6432, 6443, 6442, 6453, 6452 }; #endif @@ -9064,7 +9064,7 @@ tao_yyreduce: else { FE_Utils::T_PARAMLIST_INFO *p_list = - pt->formal_parameters (); + pt->template_params (); if (p_list != 0 && p_list->size () != 0) { @@ -9149,7 +9149,7 @@ tao_yyreduce: else { FE_Utils::T_PARAMLIST_INFO *p_list = - pt->formal_parameters (); + pt->template_params (); if (p_list != 0 && p_list->size () != 0) { @@ -9259,8 +9259,7 @@ tao_yyreduce: { AST_Connector *c = idl_global->gen ()->create_connector (&sn, - parent, - (tao_yyvsp[(3) - (5)].strval)); + parent); (void) s->fe_add_connector (c); |