summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-03-15 13:09:51 +0100
committerKarolin Seeger <kseeger@samba.org>2012-04-07 16:26:01 +0200
commit45245f10c3bd476bcb49be25bc56bb7811b85d3c (patch)
treec4ffe7217e3430d94ad556c409709db09fdcf714
parentb48e41cb5541bec34333f94fc21bcd6c47018869 (diff)
downloadsamba-45245f10c3bd476bcb49be25bc56bb7811b85d3c.tar.gz
pidl/NDR/Parser: declare all union helper variables in ParseUnionPull()
metze
-rw-r--r--pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm4
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;
}