diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2011-12-08 09:07:48 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2011-12-08 09:07:48 +0000 |
| commit | a67fe0bc8c98af0f2f0b468857c51f21f47d8e72 (patch) | |
| tree | e99132cffef6ff51e76a05dd9ef5fa29da7d2f6a /TAO/TAO_IDL/util/utl_stack.cpp | |
| parent | 094ebad8a4a3fac5422728616e3181cf3d0928f2 (diff) | |
| download | ATCD-RemedyWorkSAStart.tar.gz | |
restart work sa branchRemedyWorkSAStart
Diffstat (limited to 'TAO/TAO_IDL/util/utl_stack.cpp')
| -rw-r--r-- | TAO/TAO_IDL/util/utl_stack.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); |