diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-05 09:16:37 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-05 09:16:37 +1100 |
| commit | c46b8708f443f2f048cf41f693dfe6c133fe53f3 (patch) | |
| tree | 329f333a7c9447a9d6e81ad7d5c1734f5f90cef5 /source4/pidl/lib/Parse/Pidl/NDR.pm | |
| parent | 7e15e09f677f0167dd6b1cec2ccacdd8608e02c7 (diff) | |
| parent | 31fac9d66b0cba7a00b0887715cf7b7104108180 (diff) | |
| download | samba-c46b8708f443f2f048cf41f693dfe6c133fe53f3.tar.gz samba-c46b8708f443f2f048cf41f693dfe6c133fe53f3.tar.bz2 samba-c46b8708f443f2f048cf41f693dfe6c133fe53f3.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 7fc3669b9dc34514d8749d3941514fdae7d0f700)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/NDR.pm')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index 98e8f183a2..fb1e65854c 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -581,7 +581,7 @@ sub ParseFunction($$$) my $rettype = undef; my $thisopnum = undef; - CheckPointerTypes($d, $ndr->{PROPERTIES}->{pointer_default_top}); + CheckPointerTypes($d, "ref"); if (not defined($d->{PROPERTIES}{noopnum})) { $thisopnum = ${$opnum}; @@ -661,12 +661,6 @@ sub ParseInterface($) $idl->{PROPERTIES}->{pointer_default} = "unique"; } - if (not has_property($idl, "pointer_default_top")) { - $idl->{PROPERTIES}->{pointer_default_top} = "ref"; - } else { - warning($idl, "pointer_default_top() is a pidl extension and should not be used"); - } - foreach my $d (@{$idl->{DATA}}) { if ($d->{TYPE} eq "FUNCTION") { push (@functions, ParseFunction($idl, $d, \$opnum)); @@ -824,7 +818,6 @@ my %property_list = ( "uuid" => ["INTERFACE"], "endpoint" => ["INTERFACE"], "pointer_default" => ["INTERFACE"], - "pointer_default_top" => ["INTERFACE"], "helper" => ["INTERFACE"], "authservice" => ["INTERFACE"], |