From 59df61002312a587c28887860237dc64d55e8e2d Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 8 Jul 2004 14:50:46 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20from=20Heikki=20Tauriainen=20.=20*=20src/tgbaalgos/gtec/ce.cc=20(counter=5Fe?= =?UTF-8?q?xample::counter=5Fexample):=20Do=20not=20parenthesize=20the=20t?= =?UTF-8?q?ype=20after=20the=20new=20operator=20(g++=203.4=20complains).?= =?UTF-8?q?=20*=20src/tgbaalgos/dupexp.cc=20(dupexp=5Fiter::process=5Fstat?= =?UTF-8?q?e,=20dupexp=5Fiter::declare=5Fstate):=20Use=20this->automata=5F?= =?UTF-8?q?=A0instead=20of=20automata=5F.=20=20=A0=20Local=20member=20auto?= =?UTF-8?q?mata=5F=20inherited=20from=20template=20base=20classes=20must?= =?UTF-8?q?=20be=20prefixed=20or=20g++=203.4=20will=20not=20look=20them=20?= =?UTF-8?q?up=20(conforming=20to=20=A714.6.2.3).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 11 +++++++++++ src/tgbaalgos/dupexp.cc | 6 +++--- src/tgbaalgos/gtec/ce.cc | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ed5996a2..241f7cb00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-07-08 Alexandre Duret-Lutz + + Patch from Heikki Tauriainen . + * src/tgbaalgos/gtec/ce.cc (counter_example::counter_example): Do + not parenthesize the type after the new operator (g++ 3.4 complains). + * src/tgbaalgos/dupexp.cc (dupexp_iter::process_state, + dupexp_iter::declare_state): Use this->automata_ instead of + automata_.   Local member automata_ inherited from template base + classes must be prefixed or g++ 3.4 will not look them + up (conforming to §14.6.2.3). + 2004-07-07 Alexandre Duret-Lutz * lbtt/: Merge lbtt 1.1.0. diff --git a/src/tgbaalgos/dupexp.cc b/src/tgbaalgos/dupexp.cc index 291a8ab45..54c2923ad 100644 --- a/src/tgbaalgos/dupexp.cc +++ b/src/tgbaalgos/dupexp.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), +// 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. // @@ -46,7 +46,7 @@ namespace spot { process_state(const state* s, int n, tgba_succ_iterator*) { std::ostringstream os; - os << "(#" << n << ") " << automata_->format_state(s); + os << "(#" << n << ") " << this->automata_->format_state(s); name_[n] = os.str(); } @@ -58,7 +58,7 @@ namespace spot { if (i == name_.end()) { std::ostringstream os; - os << "(#" << n << ") " << automata_->format_state(s); + os << "(#" << n << ") " << this->automata_->format_state(s); name_[n] = str = os.str(); } else diff --git a/src/tgbaalgos/gtec/ce.cc b/src/tgbaalgos/gtec/ce.cc index 86edc2796..dac2f2415 100644 --- a/src/tgbaalgos/gtec/ce.cc +++ b/src/tgbaalgos/gtec/ce.cc @@ -42,7 +42,7 @@ namespace spot int comp_size = root.size(); // Transform the stack of connected component into an array. explicit_connected_component** scc = - new (explicit_connected_component*)[comp_size]; + new explicit_connected_component*[comp_size]; for (int j = comp_size - 1; 0 <= j; --j) { scc[j] = eccf->build();