r2933: Only pull a union once when it occurs in a subcontext

diff --git a/source/build/pidl/parser.pm b/source/build/pidl/parser.pm
index 621b12aa620e9c417e604c891162990ee63138a4..edecc24284911dd9265b74b91edbf6042a27bcc3 100644 (file)
--- a/source/build/pidl/parser.pm
+++ b/source/build/pidl/parser.pm
@@ -454,7 +454,9 @@ sub ParseElementPullSwitch($$$$)
 
        my $sub_size = util::has_property($e, "subcontext");
        if (defined $sub_size) {
-               pidl "\tNDR_CHECK(ndr_pull_subcontext_union_fn(ndr, $sub_size, $switch_var, $cprefix$var_prefix$e->{NAME}, (ndr_pull_union_fn_t) ndr_pull_$e->{TYPE}));\n";
+               pidl "\tif (($ndr_flags) & NDR_SCALARS) {\n";
+               pidl "\t\tNDR_CHECK(ndr_pull_subcontext_union_fn(ndr, $sub_size, $switch_var, $cprefix$var_prefix$e->{NAME}, (ndr_pull_union_fn_t) ndr_pull_$e->{TYPE}));\n";
+               pidl "\t}\n";
        } else {
                pidl "\tNDR_CHECK(ndr_pull_$e->{TYPE}(ndr, $ndr_flags, $switch_var, $cprefix$var_prefix$e->{NAME}));\n";
        }
@@ -484,7 +486,9 @@ sub ParseElementPushSwitch($$$$)
 
        my $sub_size = util::has_property($e, "subcontext");
        if (defined $sub_size) {
-               pidl "\tNDR_CHECK(ndr_push_subcontext_union_fn(ndr, $sub_size, $switch_var, $cprefix$var_prefix$e->{NAME}, (ndr_push_union_fn_t) ndr_push_$e->{TYPE}));\n";
+               pidl "\tif(($ndr_flags) & NDR_SCALARS) {\n";
+               pidl "\t\tNDR_CHECK(ndr_push_subcontext_union_fn(ndr, $sub_size, $switch_var, $cprefix$var_prefix$e->{NAME}, (ndr_push_union_fn_t) ndr_push_$e->{TYPE}));\n";
+               pidl "\t}\n";
        } else {
                pidl "\tNDR_CHECK(ndr_push_$e->{TYPE}(ndr, $ndr_flags, $switch_var, $cprefix$var_prefix$e->{NAME}));\n";
        }