From 2ba963200a61dcc579840039bb0c6fbb013d3bb0 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 20 Nov 2010 18:01:15 +0100 Subject: [PATCH] Fix some struct/class missmatches reported by clang. * src/ltlast/predecl.hh: Predeclare the LTL AST nodes as class, not struct. * src/ltlast/nfa.hh (formula_tree::node): Predeclare as struct, not class. --- ChangeLog | 9 +++++++++ src/ltlast/nfa.hh | 4 ++-- src/ltlast/predecl.hh | 22 ++++++++++++---------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index a080d0c0c..71892d8a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-11-20 Alexandre Duret-Lutz + + Fix some struct/class missmatches reported by clang. + + * src/ltlast/predecl.hh: Predeclare the LTL AST nodes as class, + not struct. + * src/ltlast/nfa.hh (formula_tree::node): Predeclare as struct, + not class. + 2010-11-07 Alexandre Duret-Lutz Add interface for and test the bdd_setxor() function added to Buddy. diff --git a/src/ltlast/nfa.hh b/src/ltlast/nfa.hh index aa26051fc..6dc52c8a5 100644 --- a/src/ltlast/nfa.hh +++ b/src/ltlast/nfa.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 Laboratoire de Recherche et Développement +// Copyright (C) 2008, 2010 Laboratoire de Recherche et Développement // de l'Epita (LRDE). // // This file is part of Spot, a model checking library. @@ -39,7 +39,7 @@ namespace spot /// which are defined in formula_tree.hh, included in nfa.cc. namespace formula_tree { - class node; + struct node; } /// \brief Nondeterministic Finite Automata used by automata operators. diff --git a/src/ltlast/predecl.hh b/src/ltlast/predecl.hh index 90675757d..611b6884d 100644 --- a/src/ltlast/predecl.hh +++ b/src/ltlast/predecl.hh @@ -1,6 +1,8 @@ -// 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. +// Copyright (C) 2010 Laboratoire de Recherche et Developpement +// de l'Epita. +// 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. // // This file is part of Spot, a model checking library. // @@ -36,13 +38,13 @@ namespace spot struct visitor; struct const_visitor; - struct atomic_prop; - struct unop; - struct constant; - struct binop; - struct formula; - struct multop; - struct automatop; + class atomic_prop; + class unop; + class constant; + class binop; + class formula; + class multop; + class automatop; } }