diff options
| -rw-r--r-- | pidl/lib/Parse/Pidl/NDR.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm index 249b778389..4e680b336f 100644 --- a/pidl/lib/Parse/Pidl/NDR.pm +++ b/pidl/lib/Parse/Pidl/NDR.pm @@ -39,7 +39,7 @@ $VERSION = '0.01'; use strict; use Parse::Pidl qw(warning fatal); -use Parse::Pidl::Typelist qw(hasType getType expandAlias); +use Parse::Pidl::Typelist qw(hasType getType expandAlias mapScalarType); use Parse::Pidl::Util qw(has_property property_matches); # Alignment of the built-in scalar types @@ -1010,13 +1010,13 @@ sub ValidElement($) my $discriminator_type = has_property($type->{DATA}, "switch_type"); $discriminator_type = "uint32" unless defined ($discriminator_type); - my $t1 = mapToScalar($discriminator_type); + my $t1 = mapScalarType(mapToScalar($discriminator_type)); if (not defined($t1)) { fatal($e, el_name($e) . ": unable to map discriminator type '$discriminator_type' to scalar"); } - my $t2 = mapToScalar($e2->{TYPE}); + my $t2 = mapScalarType(mapToScalar($e2->{TYPE})); if (not defined($t2)) { fatal($e, el_name($e) . ": unable to map variable used for switch_is() to scalar"); } |