Bug#624143: FTBFS with gcc 4.6.0

[Scott Howard]

Source: fparser
Version: 4.3-3
Severity: minor
Tags: patch

diff –git a/fparser/fparser.cc b/fparser/fparser.cc
index 49e6ae0..e4d88b5 100644
— a/fparser/fparser.cc
+++ b/fparser/fparser.cc
@@ -899,7 +899,7 @@ namespace
byte -= n;
if(byte > (unsigned char)(’9′-n)) return false;
unsigned long shifted = 1UL << byte;
- const unsigned long mask = LiteralMask::mask;
+ const unsigned long mask = LiteralMask<Value_t, static_cast(n)>::mask;
return (mask & shifted) != 0;
}

@@ -956,7 +956,7 @@ U+000B \v
if(byte <= (unsigned char)(' '-n))
{
unsigned long shifted = 1UL << byte;
- const unsigned long mask = SimpleSpaceMask::mask;
+ const unsigned long mask = SimpleSpaceMask<static_cast(n)>::mask;
if(mask & shifted)
{ ++function; continue; } // \r, \n, \t, \v and space
break;

fixes the following errors with my gcc 4.6.0:

fparser/fparser.cc: In function ‘bool {anonymous}::BeginsLiteral(unsigned int)’:
fparser/fparser.cc:902:58: error: could not convert template argument
‘n’ to ‘unsigned int’
fparser/fparser.cc: In function ‘void {anonymous}::SkipSpace(CharPtr&)’:
fparser/fparser.cc:959:61: error: could not convert template argument
‘n’ to ‘unsigned int’
fparser/fparser.cc: In function ‘bool
{anonymous}::BeginsLiteral(unsigned int) [with Value_t = double]’: