diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-03-15 13:09:51 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-04-10 20:35:33 +0200 |
| commit | 467845e9a0cfc451ff24d6363babb87329d38406 (patch) | |
| tree | 0dd6566358dfd2a29e1a7836a39f381d66e20891 | |
| parent | b375838e12a4d8bd39e9ca077db27ab71e05b0ec (diff) | |
| download | samba-467845e9a0cfc451ff24d6363babb87329d38406.tar.gz | |
pidl/NDR/Parser: declare all union helper variables in ParseUnionPull()
metze
(cherry picked from commit 45245f10c3bd476bcb49be25bc56bb7811b85d3c)
| -rw-r--r-- | pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 8ab2967ea5a..ccf9af97f35 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -1833,8 +1833,6 @@ sub ParseUnionPullPrimitives($$$$$) if ($el->{TYPE} ne "EMPTY") { $self->indent; - $self->DeclarePtrVariables($el); - $self->DeclareArrayVariables($el); if (defined($e->{PROPERTIES}{relative_base})) { $self->pidl("NDR_CHECK(ndr_pull_align($ndr, $el->{ALIGN}));"); # set the current offset as base for relative pointers @@ -1911,6 +1909,8 @@ sub ParseUnionPull($$$$) next if ($el->{TYPE} eq "EMPTY"); next if ($double_cases{"$el->{NAME}"}); $self->DeclareMemCtxVariables($el); + $self->DeclarePtrVariables($el); + $self->DeclareArrayVariables($el); $double_cases{"$el->{NAME}"} = 1; } |