diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-16 23:49:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:03 -0500 |
| commit | fda645af50ea82c74d51ef76b37a6b38a826c56c (patch) | |
| tree | 706d6597e5256890a10f55f95b9d02b26cacea06 /source4/pidl/lib/Parse/Pidl/NDR.pm | |
| parent | 76aa75abc6dde74d1d8d382fe8d1fa07750a90da (diff) | |
| download | samba-fda645af50ea82c74d51ef76b37a6b38a826c56c.tar.gz samba-fda645af50ea82c74d51ef76b37a6b38a826c56c.tar.bz2 samba-fda645af50ea82c74d51ef76b37a6b38a826c56c.zip | |
r15652: Fix aliases mechanism (fixes #3710)
(This used to be commit 3e89ef0875c5c8ccaafa9694d27a8043930127e6)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/NDR.pm')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index 3cbf416488..5839b042d3 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -37,7 +37,7 @@ $VERSION = '0.01'; @EXPORT = qw(GetPrevLevel GetNextLevel ContainsDeferred ContainsString); use strict; -use Parse::Pidl::Typelist qw(hasType getType); +use Parse::Pidl::Typelist qw(hasType getType expandAlias); use Parse::Pidl::Util qw(has_property property_matches); # Alignment of the built-in scalar types @@ -364,6 +364,8 @@ sub ParseElement($) { my $e = shift; + $e->{TYPE} = expandAlias($e->{TYPE}); + return { NAME => $e->{NAME}, TYPE => $e->{TYPE}, @@ -549,7 +551,7 @@ sub ParseFunction($$$) } if ($d->{RETURN_TYPE} ne "void") { - $rettype = $d->{RETURN_TYPE}; + $rettype = expandAlias($d->{RETURN_TYPE}); } my $async = 0; |