diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-02 21:19:35 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-02 21:19:35 +0000 |
| commit | d11cc27a8bdedad40d0d03f0f6668f603f03af17 (patch) | |
| tree | 64510a15b0f1f025d3f4927aa90788c68db3b1c7 | |
| parent | 60468d31094f34040917d51077f279d580c3ad18 (diff) | |
| download | ATCD-d11cc27a8bdedad40d0d03f0f6668f603f03af17.tar.gz | |
ChangeLogTag: Tue Aug 2 21:18:02 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.yy | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/y.tab.cpp | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a53eca224df..57785382d17 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Aug 2 21:18:02 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Fixed some mismatched allocate/deallocate errors. Thanks to + Johnny Willemsen <jwillemsen@rememdy.nl> for pointing them + out. + Tue Aug 2 13:01:58 2005 Steve Totten <totten_s@ociweb.com> Applied the following change from the OCI TAO 1.4a repository on diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index e785b5e6dd5..b60d8fa9aef 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -4889,7 +4889,7 @@ factory_decl : home->factories ().enqueue_tail (o); } - ACE_OS::free ($2); + delete $2; $2 = 0; /* @@ -4958,7 +4958,7 @@ finder_decl : home->finders ().enqueue_tail (o); } - ACE_OS::free ($2); + delete $2; $2 = 0; /* diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index 6fd84fb8f03..6b7a64e96d0 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -7179,7 +7179,7 @@ tao_yyreduce: home->factories ().enqueue_tail (o); } - ACE_OS::free (tao_yyvsp[0].idval); + delete tao_yyvsp[0].idval; tao_yyvsp[0].idval = 0; /* @@ -7253,7 +7253,7 @@ tao_yyreduce: home->finders ().enqueue_tail (o); } - ACE_OS::free (tao_yyvsp[0].idval); + delete tao_yyvsp[0].idval; tao_yyvsp[0].idval = 0; /* |