diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-02-02 10:18:33 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-02-04 18:37:09 +0100 |
| commit | 31fac9d66b0cba7a00b0887715cf7b7104108180 (patch) | |
| tree | a6fec765d53c68e0e73c9212993baaf4ee148a47 | |
| parent | 569bd9222d3c65b24cd9021bb76018cb23775ad3 (diff) | |
| download | samba-31fac9d66b0cba7a00b0887715cf7b7104108180.tar.gz samba-31fac9d66b0cba7a00b0887715cf7b7104108180.tar.bz2 samba-31fac9d66b0cba7a00b0887715cf7b7104108180.zip | |
pidl: remove 'pointer_default_top()' support
metze
(This used to be commit 145d6c8ea0eafc69cdeca45fbf296148b890133d)
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Compat.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 9 | ||||
| -rwxr-xr-x | source4/pidl/tests/ndr_compat.pl | 6 |
3 files changed, 1 insertions, 18 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Compat.pm b/source4/pidl/lib/Parse/Pidl/Compat.pm index 7939bb2df2..7519021144 100644 --- a/source4/pidl/lib/Parse/Pidl/Compat.pm +++ b/source4/pidl/lib/Parse/Pidl/Compat.pm @@ -148,10 +148,6 @@ sub CheckInterface($) { my $if = shift; - if (has_property($if, "pointer_default_top") and - $if->{PROPERTIES}->{pointer_default_top} ne "ref") { - warning($if, "pointer_default_top() is pidl-specific"); - } } sub Check($) 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"], diff --git a/source4/pidl/tests/ndr_compat.pl b/source4/pidl/tests/ndr_compat.pl index 735d929e27..11b585c118 100755 --- a/source4/pidl/tests/ndr_compat.pl +++ b/source4/pidl/tests/ndr_compat.pl @@ -19,9 +19,3 @@ sub parse_idl($) test_warnings("", sub {parse_idl("void x();"); }); test_warnings("nofile:0: top-level [out] pointer `x' is not a [ref] pointer\n", sub {parse_idl("void x([out,unique] int *x);"); }); - -test_warnings("nofile:0: pointer_default_top() is a pidl extension and should not be used\n", sub { - my $pidl = Parse::Pidl::IDL::parse_string("[pointer_default_top(unique)] interface echo { void x(); }; ", "nofile"); - Parse::Pidl::NDR::Parse($pidl); -}); - |