diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-12-07 17:59:59 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-12-07 17:59:59 +0000 |
| commit | b922aa411de4367561a9f4d53dda53796c833f3d (patch) | |
| tree | c8be56360cd738a0509c94a8945b9e97d7cd11f9 | |
| parent | 9bbcfd5dc735b6319b7f984018afc96ec76838a7 (diff) | |
| download | ATCD-b922aa411de4367561a9f4d53dda53796c833f3d.tar.gz | |
Wed Dec 7 17:54:41 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_stack.cpp | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index facef563acf..41fa1dce919 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Dec 7 17:54:41 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/util/utl_stack.cpp(UTL_ScopeStack::pop): + + Checks if the top scope has a #pragma prefix associated with it, + and if so, pops the prefix (from its own stack) along with the + scope. Fixed the check to be more robust. Thanks to Simon Massey + for reporting the problem, which was revealed as an error message + reporting a bogus prefix inconsistency between a forward declared + struct and its full definition. + Wed Dec 7 10:47:15 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> Merged in the changes to update AMI4CCM to match the initial revision diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp index aac41c094af..70c0168fe62 100644 --- a/TAO/TAO_IDL/util/utl_stack.cpp +++ b/TAO/TAO_IDL/util/utl_stack.cpp @@ -129,9 +129,11 @@ UTL_ScopeStack::pop (void) return; } + UTL_Scope *current = this->top (); + // If our top scope has a #pragma prefix associated with it, // it goes away with the scope. - if (this->top_non_null ()->has_prefix ()) + if (current != 0 && current->has_prefix ()) { char *trash = 0; idl_global->pragma_prefixes ().pop (trash); |