Commit bbbc1acc authored by Guillaume Sadegh's avatar Guillaume Sadegh
Browse files

Minor fixes to compile with GCC 4.4.

2009-04-09  Guillaume SADEGH  <sadegh@lrde.epita.fr>

	* src/eltlparse/eltlparse.yy (subformula): Avoid a comparaison
	between a signed and an unsigned value.
	* src/ltlast/automatop.hh, src/ltlast/automatop.cc (nfa): Avoid
	a name clash with the `nfa' class.
parent 7643c49c
2009-04-09 Guillaume SADEGH <sadegh@lrde.epita.fr>
Minor fixes to compile with GCC 4.4.
* src/eltlparse/eltlparse.yy (subformula): Avoid a comparaison
between a signed and an unsigned value.
* src/ltlast/automatop.hh, src/ltlast/automatop.cc (nfa): Avoid
a name clash with the `nfa' class.
2009-04-08 Damien Lefortier <dam@lrde.epita.fr>
Correct LaCIM for ELTL and make it work with LBTT.
......
......@@ -75,7 +75,7 @@ namespace spot
};
struct alias_nfa : alias
{
nfa::ptr nfa;
spot::ltl::nfa::ptr nfa;
std::list<alias_ptr> s;
};
struct alias_arg : alias
......@@ -332,7 +332,8 @@ nfa_alias: IDENT "(" nfa_alias_arg_list ")"
CHECK_EXISTING_NMAP(@1, $1);
nfa::ptr np = nmap[*$1];
CHECK_ARITY(@1, $1, $3->s.size(), np->arity());
CHECK_ARITY(@1, $1, $3->s.size(),
static_cast<unsigned>(np->arity()));
$3->nfa = np;
$$ = $3;
}
......@@ -426,7 +427,6 @@ subformula: ATOMIC_PROP
{
CHECK_EXISTING_NMAP(@1, $2);
nfa::ptr np = nmap[*$2];
CHECK_ARITY(@1, $2, 2, np->arity());
automatop::vec* v = new automatop::vec;
v->push_back($1);
......@@ -449,7 +449,8 @@ subformula: ATOMIC_PROP
CHECK_EXISTING_NMAP(@1, $1);
nfa::ptr np = nmap[*$1];
CHECK_ARITY(@1, $1, $3->size(), np->arity());
CHECK_ARITY(@1, $1, $3->size(),
static_cast<unsigned>(np->arity()));
$$ = automatop::instance(np, $3, false);
}
delete $1;
......
......@@ -99,7 +99,7 @@ namespace spot
return (*children_)[n];
}
const nfa::ptr
const spot::ltl::nfa::ptr
automatop::nfa() const
{
assert(nfa_ != 0);
......
......@@ -66,7 +66,7 @@ namespace spot
formula* nth(unsigned n);
/// Get the NFA of this operator.
const nfa::ptr nfa() const;
const spot::ltl::nfa::ptr nfa() const;
bool is_negated() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment