diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-16 22:13:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:28:19 -0500 |
| commit | 5b05f5f5f1bad489091c715867eddda7eff4c8c6 (patch) | |
| tree | 8907b4fac57160004013a929b03339b95f62cdbf /source4/pidl/lib/Parse | |
| parent | e3ea863a3c4a021966847b62bf175fc83daa3fd0 (diff) | |
| download | samba-5b05f5f5f1bad489091c715867eddda7eff4c8c6.tar.gz samba-5b05f5f5f1bad489091c715867eddda7eff4c8c6.tar.bz2 samba-5b05f5f5f1bad489091c715867eddda7eff4c8c6.zip | |
r19752: Remove support for the `depends' attribute (use "import") instead.
(This used to be commit 324395afc725e90f44f286fd776b38a64bdc8e3b)
Diffstat (limited to 'source4/pidl/lib/Parse')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 5 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/Header.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 3 |
5 files changed, 0 insertions, 20 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index 86bd62044b..a80bb954c1 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -766,7 +766,6 @@ my %property_list = ( "endpoint" => ["INTERFACE"], "pointer_default" => ["INTERFACE"], "pointer_default_top" => ["INTERFACE"], - "depends" => ["INTERFACE"], "helper" => ["INTERFACE"], "authservice" => ["INTERFACE"], @@ -1045,10 +1044,6 @@ sub ValidInterface($) my($interface) = shift; my($data) = $interface->{DATA}; - if (has_property($interface, "depends")) { - nonfatal $interface, "depends() is pidl-specific and deprecated. Use `import' instead"; - } - if (has_property($interface, "helper")) { nonfatal $interface, "helper() is pidl-specific and deprecated. Use `include' instead"; } diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm index bb3b36dca4..960f610cd9 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm @@ -753,10 +753,6 @@ sub EjsInterface($$) pidl_hdr "#ifndef _HEADER_EJS_$interface->{NAME}\n"; pidl_hdr "#define _HEADER_EJS_$interface->{NAME}\n\n"; - if (has_property($interface, "depends")) { - EjsImport(split / /, $interface->{PROPERTIES}->{depends}); - } - pidl_hdr "\n"; foreach my $d (@{$interface->{TYPES}}) { diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm index 6a999d4147..da7d39a238 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm @@ -334,10 +334,6 @@ sub HeaderInterface($) pidl "#ifndef _HEADER_$interface->{NAME}\n"; pidl "#define _HEADER_$interface->{NAME}\n\n"; - if (defined $interface->{PROPERTIES}->{depends}) { - HeaderImport(split / /, $interface->{PROPERTIES}->{depends}); - } - foreach my $d (@{$interface->{DATA}}) { next if ($d->{TYPE} ne "CONST"); HeaderConst($d); diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 80d02cb533..d871ed38bb 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -2258,10 +2258,6 @@ sub HeaderInterface($) pidl choose_header("librpc/gen_ndr/ndr_orpc.h", "ndr/orpc.h"); } - if (defined $interface->{PROPERTIES}->{depends}) { - HeaderImport(split / /, $interface->{PROPERTIES}->{depends}); - } - if (defined $interface->{PROPERTIES}->{helper}) { HeaderInclude(split / /, $interface->{PROPERTIES}->{helper}); } diff --git a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 7b8691e044..14b922353a 100644 --- a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -747,9 +747,6 @@ sub ProcessInterface($) pidl_hdr "#define $define"; pidl_hdr ""; - ProcessImport(split / /, $x->{PROPERTIES}->{depends}) if - (defined $x->{PROPERTIES}->{depends}); - pidl_def "static gint proto_dcerpc_$x->{NAME} = -1;"; register_ett("ett_dcerpc_$x->{NAME}"); register_hf_field("hf_$x->{NAME}_opnum", "Operation", "$x->{NAME}.opnum", "FT_UINT16", "BASE_DEC", "NULL", 0, ""); |