From 79dd73b042edd81edb5e030459a43777ffa980bf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 1 Jan 2012 19:30:40 -0600 Subject: [PATCH] Fix FTBFS --- kalyptus/kalyptusCxxToSmoke.pm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index 8aa6897..e992ec0 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -2469,7 +2469,7 @@ sub writeSmokeDataFile($) { die "'Method index' for enum $sig not found" unless defined $xmethIndex; my $typeId = findTypeEntry( $fullEnumName )->{index}; die "enum has no {case} value in $className: $fullEnumName" unless defined $classNode->{case}{$fullEnumName}; - print OUT "\t{$classIndex, $xmethIndex, 0, 0, Smoke::mf_static|Smoke::mf_enum, $typeId, $classNode->{case}{$fullEnumName}},\t//$methodCount $fullEnumName (enum)\n"; + print OUT "\t{$classIndex, $xmethIndex, 0, 0, Smoke::mf_static, $typeId, $classNode->{case}{$fullEnumName}},\t//$methodCount $fullEnumName (enum)\n"; $allMethods{$sig} = $methodCount; print STDERR "Added entry for " . $sig . " into \$allMethods\n" if ($debug); $methods[$methodCount] = { @@ -2568,12 +2568,6 @@ sub writeSmokeDataFile($) { my $methodFlags = '0'; # Make no distinction between a static method in an ordinary class, or a method in a namespace $methodFlags .= "|Smoke::mf_static" if $m->{Flags} =~ "s" or $classNode->{NodeType} eq 'namespace'; - $methodFlags .= "|Smoke::mf_const" if $m->{Flags} =~ "c"; # useful?? probably not - $methodFlags .= "|Smoke::mf_copyctor" if $m->{Flags} =~ "x"; - $methodFlags .= "|Smoke::mf_internal" if $m->{Flags} =~ "i"; - $methodFlags .= "|Smoke::mf_ctor" if $methName eq $className; - $methodFlags .= "|Smoke::mf_dtor" if $m->{ReturnType} eq '~'; - $methodFlags .= "|Smoke::mf_protected" if $m->{Access} =~ /protected/; $methodFlags =~ s/0\|//; # beautify print OUT "\t{$classIndex, $methodIndex, $arglist, $argcnt, $methodFlags, $retTypeIndex, $case},\t//$methodCount $className\::$sig";