From bbbc1acc143b29cb1edfa3db2e0bd16c68979d13 Mon Sep 17 00:00:00 2001
From: Guillaume Sadegh <sadegh@lrde.epita.fr>
Date: Thu, 9 Apr 2009 17:14:32 +0200
Subject: [PATCH] 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.
---
 ChangeLog                  | 9 +++++++++
 src/eltlparse/eltlparse.yy | 9 +++++----
 src/ltlast/automatop.cc    | 2 +-
 src/ltlast/automatop.hh    | 2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 121503ce4..ece7cf309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
diff --git a/src/eltlparse/eltlparse.yy b/src/eltlparse/eltlparse.yy
index e875e45c7..5debf3595 100644
--- a/src/eltlparse/eltlparse.yy
+++ b/src/eltlparse/eltlparse.yy
@@ -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;
diff --git a/src/ltlast/automatop.cc b/src/ltlast/automatop.cc
index e4d10db44..bef06886d 100644
--- a/src/ltlast/automatop.cc
+++ b/src/ltlast/automatop.cc
@@ -99,7 +99,7 @@ namespace spot
       return (*children_)[n];
     }
 
-    const nfa::ptr
+    const spot::ltl::nfa::ptr
     automatop::nfa() const
     {
       assert(nfa_ != 0);
diff --git a/src/ltlast/automatop.hh b/src/ltlast/automatop.hh
index 4ba2177a9..df3b229bd 100644
--- a/src/ltlast/automatop.hh
+++ b/src/ltlast/automatop.hh
@@ -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;