The branch, master has been updated
via ae507f6... Merge branch 'master' of
ssh://git.samba.org/data/git/samba
via dfbaf79... pidl: don't warn for compatible scalar types in unions
from 4a1b50a... s3-netlogon: pass down account name to remote password
set functions.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ae507f620ae34b69c5df86980ea6e374c9c1e548
Merge: dfbaf79a1b7455a0eef61813e07cb661cf17e995
4a1b50afd567313cc25d5bbc14e01e170aa62a00
Author: Andrew Tridgell <tri...@samba.org>
Date: Tue Oct 13 10:03:57 2009 +1100
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit dfbaf79a1b7455a0eef61813e07cb661cf17e995
Author: Andrew Tridgell <tri...@samba.org>
Date: Tue Oct 13 10:03:27 2009 +1100
pidl: don't warn for compatible scalar types in unions
When we have an enum that is used as a union discriminator, what
matters is that the scalar mappings are the same, not if the types are
the same (otherwise we get warnings about uint1632).
Thanks to gd for noticing this.
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/NDR.pm | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index 249b778..4e680b3 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");
}
--
Samba Shared Repository
