diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-12 01:22:23 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-12 01:22:23 +0100 |
commit | 87fc0a43915fcdce3ac8deea50f3fafffaa42c37 (patch) | |
tree | 1e4c79ce42795fad1d0d4655d405254396fdc547 /source4/pidl/lib/Parse/Pidl/NDR.pm | |
parent | 236a780baa959236ff7879d109fa8ba5b067dc88 (diff) | |
download | samba-87fc0a43915fcdce3ac8deea50f3fafffaa42c37.tar.gz samba-87fc0a43915fcdce3ac8deea50f3fafffaa42c37.tar.bz2 samba-87fc0a43915fcdce3ac8deea50f3fafffaa42c37.zip |
pidl: Remove support for the declare keyword in other parts of the pidl code.
(This used to be commit 2fe013f715bdee6c01a833bc6c883e830bdc5dfd)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/NDR.pm')
-rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index f624d2bdc0..8e7cf40d90 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -287,8 +287,6 @@ sub can_contain_deferred($) return 0 if (Parse::Pidl::Typelist::is_scalar($type)); - return 1 if ($type->{TYPE} eq "DECLARE"); # assume the worst - return can_contain_deferred($type->{DATA}) if ($type->{TYPE} eq "TYPEDEF"); return 0 unless defined($type->{ELEMENTS}); @@ -362,7 +360,7 @@ sub align_type($) my $dt = getType($e); - if ($dt->{TYPE} eq "TYPEDEF" or $dt->{TYPE} eq "DECLARE") { + if ($dt->{TYPE} eq "TYPEDEF") { return align_type($dt->{DATA}); } elsif ($dt->{TYPE} eq "ENUM") { return align_type(Parse::Pidl::Typelist::enum_type_fn($dt)); @@ -650,7 +648,6 @@ sub ParseInterface($) my @consts = (); my @functions = (); my @endpoints; - my @declares = (); my $opnum = 0; my $version; @@ -667,9 +664,7 @@ sub ParseInterface($) } foreach my $d (@{$idl->{DATA}}) { - if ($d->{TYPE} eq "DECLARE") { - push (@declares, $d); - } elsif ($d->{TYPE} eq "FUNCTION") { + if ($d->{TYPE} eq "FUNCTION") { push (@functions, ParseFunction($idl, $d, \$opnum)); } elsif ($d->{TYPE} eq "CONST") { push (@consts, ParseConst($idl, $d)); @@ -701,7 +696,6 @@ sub ParseInterface($) FUNCTIONS => \@functions, CONSTS => \@consts, TYPES => \@types, - DECLARES => \@declares, ENDPOINTS => \@endpoints }; } |