Minor fixes to compile with GCC 3.3

* src/ltlast/automatop.cc, src/ltlast/automatop.hh: Rename nfa as
get_nfa to avoid a name clash with the `nfa' class.
* src/ltlvisit/clone.cc, src/ltlvisit/nenoform.cc,
src/ltlvisit/tostring.cc, src/tgbaalgos/eltl2tgba_lacim.cc: Use
get_nfa instead of nfa.
* src/tgba/tgbasafracomplement.cc: Don't use a
const_reverse_iterator.

ChangeLog

@@ -1,3 +1,15 @@
+2010-01-20  Damien Lefortier <dam@lrde.epita.fr>
+
+	Minor fixes to compile with GCC 3.3
+
+	* src/ltlast/automatop.cc, src/ltlast/automatop.hh: Rename nfa as
+	get_nfa to avoid a name clash with the `nfa' class.
+	* src/ltlvisit/clone.cc, src/ltlvisit/nenoform.cc,
+	src/ltlvisit/tostring.cc, src/tgbaalgos/eltl2tgba_lacim.cc: Use
+	get_nfa instead of nfa.
+	* src/tgba/tgbasafracomplement.cc: Don't use a
+	const_reverse_iterator.
+
 2010-01-20  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	Remove some non-determinism in random_graph()
@@ -8,7 +20,7 @@
 	some non-determinism because of the memory layout.  It was almost
 	impossible to reproduce bugs found by tests based on randtgba.
 
-2010-01-18  Damien Lefortier <dam@lrde.epita.fr>
+2010-01-19  Damien Lefortier <dam@lrde.epita.fr>
 
 	* src/tgbaalgos/ltl2taa.cc: Fix the previous patch.
 

src/ltlast/automatop.cc

@@ -35,7 +35,7 @@ namespace spot
     automatop::~automatop()
     {
       // Get this instance out of the instance map.
-      triplet p(std::make_pair(nfa(), negated_), children_);
+      triplet p(std::make_pair(get_nfa(), negated_), children_);
       map::iterator i = instances.find(p);
       assert (i != instances.end());
       instances.erase(i);
@@ -51,7 +51,7 @@ namespace spot
     automatop::dump() const
     {
       std::string r = is_negated() ? "!" : "";
-      r += nfa()->get_name();
+      r += get_nfa()->get_name();
       r += "(";
       r += nth(0)->dump();
       for (unsigned n = 1; n < size(); ++n)
@@ -112,7 +112,7 @@ namespace spot
     }
 
     const spot::ltl::nfa::ptr
-    automatop::nfa() const
+    automatop::get_nfa() const
     {
       assert(nfa_ != 0);
       return nfa_;

src/ltlast/automatop.hh

@@ -66,7 +66,7 @@ namespace spot
       formula* nth(unsigned n);
 
       /// Get the NFA of this operator.
-      const spot::ltl::nfa::ptr nfa() const;
+      const spot::ltl::nfa::ptr get_nfa() const;
 
       /// Whether the automaton is negated.
       bool is_negated() const;

src/ltlvisit/clone.cc

@@ -71,7 +71,7 @@ namespace spot
       automatop::vec* res = new automatop::vec;
       for (unsigned i = 0; i < ao->size(); ++i)
         res->push_back(recurse(ao->nth(i)));
-      result_ = automatop::instance(ao->nfa(), res, ao->is_negated());
+      result_ = automatop::instance(ao->get_nfa(), res, ao->is_negated());
     }
 
     void

src/ltlvisit/nenoform.cc

@@ -166,7 +166,7 @@ namespace spot
 	  unsigned aos = ao->size();
 	  for (unsigned i = 0; i < aos; ++i)
 	    res->push_back(recurse(ao->nth(i)));
-	  result_ = automatop::instance(ao->nfa(), res, negated);
+	  result_ = automatop::instance(ao->get_nfa(), res, negated);
 	}
 
 	void

src/ltlvisit/tostring.cc

@@ -167,7 +167,7 @@ namespace spot
 	  top_level_ = false;
 	  if (!top_level)
 	    os_ << "(";
-	  os_ << ao->nfa()->get_name() << "(";
+	  os_ << ao->get_nfa()->get_name() << "(";
 	  unsigned max = ao->size();
 	  ao->nth(0)->accept(*this);
 	  for (unsigned n = 1; n < max; ++n)
@@ -324,7 +324,7 @@ namespace spot
 	  top_level_ = false;
 	  if (!top_level)
 	    os_ << "(";
-	  os_ << ao->nfa()->get_name() << "(";
+	  os_ << ao->get_nfa()->get_name() << "(";
 	  unsigned max = ao->size();
 	  ao->nth(0)->accept(*this);
 	  for (unsigned n = 1; n < max; ++n)

src/tgba/tgbasafracomplement.cc

@@ -815,7 +815,7 @@ namespace spot
       void print_safra_automaton(safra_tree_automaton* a)
       {
         safra_tree_automaton::automaton_t node_list = a->automaton;
-        typedef safra_tree_automaton::automaton_t::const_reverse_iterator
+        typedef safra_tree_automaton::automaton_t::reverse_iterator
           automaton_cit;
         typedef safra_tree_automaton::transition_list::const_iterator
           trans_cit;
@@ -825,6 +825,8 @@ namespace spot
 
         std::cout << "digraph A {" << std::endl;
 
+	/// GCC 3.3 complains if a const_reverse_iterator is used.
+	/// error: no match for 'operator!='
         for (automaton_cit i = a->automaton.rbegin();
              i != a->automaton.rend();
              ++i)

src/tgbaalgos/eltl2tgba_lacim.cc

@@ -170,12 +170,12 @@ namespace spot
 	  v.push_back(const_cast<formula*>(node->nth(i)));
 
 	std::pair<int, int> vp =
-	  recurse_state(node->nfa(),
+	  recurse_state(node->get_nfa(),
-			node->nfa()->get_init_state(), v, m, acc, finish);
+			node->get_nfa()->get_init_state(), v, m, acc, finish);
 
 	// Update finish_ with finish(node).
 	// FIXME: when node is loop, it does not make sense; hence the bddtrue.
-	finish_[node] = !node->nfa()->is_loop() ? bddtrue : finish;
+	finish_[node] = !node->get_nfa()->is_loop() ? bddtrue : finish;
 
 	bdd tmp = bddtrue;
 	for (nmap::iterator it = m.begin(); it != m.end(); ++it)