From 101b18b24bef27d858cd918ba2f2cccdff958682 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 28 Aug 2011 10:35:36 +0200 Subject: [PATCH] Fix errors reported by clang++-2.9. * src/evtgbaalgos/tgba2evtgba.cc (process_link): Fix prototype to match tgba_reachable_iterator::process_link. * src/ltlvisit/tunabbrev.hh: Add using super::visit, so that the other visit() method are in scope when we overload one. * src/tgba/tgbareduc.hh, src/tgba/tgbareduc.cc (start, end, process_link): Remove these empty methods. The default implementations are empty too, and process_link had the wrong prototype. * src/tgbaalgos/reductgba_sim.hh, src/tgbaalgos/reductgba_sim.cc (start, end, process_link): Likewise. --- ChangeLog | 15 +++++++++++++++ src/evtgbaalgos/tgba2evtgba.cc | 4 +++- src/ltlvisit/tunabbrev.hh | 3 +++ src/tgba/tgbareduc.cc | 15 --------------- src/tgba/tgbareduc.hh | 13 +++++-------- src/tgbaalgos/reductgba_sim.cc | 17 ----------------- src/tgbaalgos/reductgba_sim.hh | 7 ++----- 7 files changed, 28 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59369fd91..cac5835d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2011-08-28 Alexandre Duret-Lutz + + Fix errors reported by clang++-2.9. + + * src/evtgbaalgos/tgba2evtgba.cc (process_link): Fix prototype + to match tgba_reachable_iterator::process_link. + * src/ltlvisit/tunabbrev.hh: Add using super::visit, so that the + other visit() method are in scope when we overload one. + * src/tgba/tgbareduc.hh, src/tgba/tgbareduc.cc (start, end, + process_link): Remove these empty methods. The default + implementations are empty too, and process_link had the + wrong prototype. + * src/tgbaalgos/reductgba_sim.hh, src/tgbaalgos/reductgba_sim.cc + (start, end, process_link): Likewise. + 2011-08-27 Alexandre Duret-Lutz Improve SCC simplification by removing implied acceptance conditions. diff --git a/src/evtgbaalgos/tgba2evtgba.cc b/src/evtgbaalgos/tgba2evtgba.cc index d103c5ef1..398a6fb20 100644 --- a/src/evtgbaalgos/tgba2evtgba.cc +++ b/src/evtgbaalgos/tgba2evtgba.cc @@ -64,7 +64,9 @@ namespace spot } virtual void - process_link(int in, int out, const tgba_succ_iterator* si) + process_link(const state*, int in, + const state*, int out, + const tgba_succ_iterator* si) { // We might need to format out before process_state is called. name_map_::const_iterator i = name_.find(out); diff --git a/src/ltlvisit/tunabbrev.hh b/src/ltlvisit/tunabbrev.hh index 875d8c478..8f07ef7c5 100644 --- a/src/ltlvisit/tunabbrev.hh +++ b/src/ltlvisit/tunabbrev.hh @@ -1,3 +1,5 @@ +// Copyright (C) 2011 Laboratoire de Recherche et Développement de +// l'Epita (LRDE). // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), // département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. @@ -50,6 +52,7 @@ namespace spot unabbreviate_ltl_visitor(); virtual ~unabbreviate_ltl_visitor(); + using super::visit; void visit(unop* uo); formula* recurse(formula* f); diff --git a/src/tgba/tgbareduc.cc b/src/tgba/tgbareduc.cc index 31ccb9ef3..df9424302 100644 --- a/src/tgba/tgbareduc.cc +++ b/src/tgba/tgbareduc.cc @@ -129,16 +129,6 @@ namespace spot //////////////////////////////////////////// // for build tgba_reduc - void - tgba_reduc::start() - { - } - - void - tgba_reduc::end() - { - } - void tgba_reduc::process_state(const spot::state* s, int, tgba_succ_iterator* si) { @@ -158,11 +148,6 @@ namespace spot } } - void - tgba_reduc::process_link(int, int, const tgba_succ_iterator*) - { - } - tgba_explicit::transition* tgba_reduc::create_transition(const spot::state* source, const spot::state* dest) diff --git a/src/tgba/tgbareduc.hh b/src/tgba/tgbareduc.hh index ee9395060..a07963a56 100644 --- a/src/tgba/tgbareduc.hh +++ b/src/tgba/tgbareduc.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2011 Laboratoire de Recherche et Développement +// Copyright (C) 2008, 2009, 2011 Laboratoire de Recherche et Développement // de l'Epita (LRDE). // Copyright (C) 2004, 2005, 2006 Laboratoire d'Informatique de // Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), @@ -81,10 +81,7 @@ namespace spot sp_map state_predecessor_map_; // Interface of tgba_reachable_iterator_breadth_first - void start(); - void end(); void process_state(const spot::state* s, int n, tgba_succ_iterator* si); - void process_link(int in, int out, const tgba_succ_iterator* si); /// Create a transition using two state of a TGBA. transition* create_transition(const spot::state* source, @@ -124,15 +121,15 @@ namespace spot /// this is explain in /// \verbatim /// @InProceedings{ etessami.00.concur, - /// author = {Kousha Etessami and Gerard J. Holzmann}, + /// author = {Kousha Etessami and Gerard J. Holzmann}, /// title = {Optimizing {B\"u}chi Automata}, /// booktitle = {Proceedings of the 11th International Conference on /// Concurrency Theory (Concur'2000)}, /// pages = {153--167}, /// year = {2000}, - /// editor = {C. Palamidessi}, - /// volume = {1877}, - /// series = {Lecture Notes in Computer Science}, + /// editor = {C. Palamidessi}, + /// volume = {1877}, + /// series = {Lecture Notes in Computer Science}, /// publisher = {Springer-Verlag} /// } /// \endverbatim diff --git a/src/tgbaalgos/reductgba_sim.cc b/src/tgbaalgos/reductgba_sim.cc index cdbe2a241..087d76ccd 100644 --- a/src/tgbaalgos/reductgba_sim.cc +++ b/src/tgbaalgos/reductgba_sim.cc @@ -267,16 +267,6 @@ namespace spot /////////////////////////////////////////////////////////////////////// // parity_game_graph - void - parity_game_graph::start() - { - } - - void - parity_game_graph::end() - { - } - void parity_game_graph::process_state(const state* s, int, @@ -285,13 +275,6 @@ namespace spot tgba_state_.push_back(s); } - void - parity_game_graph::process_link(int, - int, - const tgba_succ_iterator*) - { - } - void parity_game_graph::print(std::ostream& os) { diff --git a/src/tgbaalgos/reductgba_sim.hh b/src/tgbaalgos/reductgba_sim.hh index 3e15348b8..917e51846 100644 --- a/src/tgbaalgos/reductgba_sim.hh +++ b/src/tgbaalgos/reductgba_sim.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement -// de l'Epita (LRDE). +// Copyright (C) 2009, 2010, 2011 Laboratoire de Recherche et +// Développement de l'Epita (LRDE). // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. @@ -116,10 +116,7 @@ namespace spot s_v tgba_state_; int nb_node_parity_game; - void start(); - void end(); void process_state(const state* s, int n, tgba_succ_iterator* si); - void process_link(int in, int out, const tgba_succ_iterator* si); /// \brief Compute each node of the graph. virtual void build_graph() = 0;