diff --git a/lbtt/ChangeLog b/lbtt/ChangeLog index 575f0da51..3d41df892 100644 --- a/lbtt/ChangeLog +++ b/lbtt/ChangeLog @@ -1,3 +1,18 @@ +2004-01-16 Alexandre Duret-Lutz + + * src/Alloc.h: Rename as ... + * src/ObstackAlloc.h: ... this. The problem is that alloc.h is a + system header in g++ < 3.0, and Darwin has a case-insensitive + filesystem. System headers that include alloc.h pick the local + Alloc.h version. + * BuchiAutomaton.h, Configuration.h, DispUtil.cc, + ExternalTranslator.h, FormulaRandomizer.h, Graph.h.in, + LtlFormula.h, Makefile.am, NeverClaimAutomaton.h, PathEvaluator.h, + ProductAutomaton.h, SccIterator.h, SharedTestData.h, + StatDisplay.h, StateSpace.h, StateSpaceRandomizer.cc, + StringUtil.h, TestOperations.h, TestRoundInfo.h, TestStatistics.h, + UserCommandReader.h, UserCommands.h, main.cc: Adjust includes. + 2003-12-29 Alexandre Duret-Lutz * doc/texinfo.tex: New upstream version. diff --git a/lbtt/src/BuchiAutomaton.h b/lbtt/src/BuchiAutomaton.h index 7b58867b3..e1bd12ca4 100644 --- a/lbtt/src/BuchiAutomaton.h +++ b/lbtt/src/BuchiAutomaton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BitArray.h" #include "EdgeContainer.h" #include "Exception.h" diff --git a/lbtt/src/Configuration.h b/lbtt/src/Configuration.h index a0f4014e5..3b053c525 100644 --- a/lbtt/src/Configuration.h +++ b/lbtt/src/Configuration.h @@ -31,7 +31,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Exception.h" #include "FormulaRandomizer.h" #include "StateSpaceRandomizer.h" diff --git a/lbtt/src/DispUtil.cc b/lbtt/src/DispUtil.cc index 3c99f0d43..4876a5726 100644 --- a/lbtt/src/DispUtil.cc +++ b/lbtt/src/DispUtil.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "DispUtil.h" /****************************************************************************** diff --git a/lbtt/src/ExternalTranslator.h b/lbtt/src/ExternalTranslator.h index 763a9bb59..5dcd21f37 100644 --- a/lbtt/src/ExternalTranslator.h +++ b/lbtt/src/ExternalTranslator.h @@ -33,7 +33,7 @@ #else #include #endif /* HAVE_SSTREAM */ -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Exception.h" #include "LtlFormula.h" #include "translate.h" diff --git a/lbtt/src/FormulaRandomizer.h b/lbtt/src/FormulaRandomizer.h index c23348f49..d9d227b86 100644 --- a/lbtt/src/FormulaRandomizer.h +++ b/lbtt/src/FormulaRandomizer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "LtlFormula.h" namespace Ltl diff --git a/lbtt/src/Graph.h.in b/lbtt/src/Graph.h.in index f701b58a3..8a9b3605b 100644 --- a/lbtt/src/Graph.h.in +++ b/lbtt/src/Graph.h.in @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -34,7 +34,7 @@ using SLIST_NAMESPACE::slist; #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BitArray.h" #include "Exception.h" diff --git a/lbtt/src/LtlFormula.h b/lbtt/src/LtlFormula.h index fee7e8f60..70c56fad4 100644 --- a/lbtt/src/LtlFormula.h +++ b/lbtt/src/LtlFormula.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BitArray.h" #include "Exception.h" diff --git a/lbtt/src/Makefile.am b/lbtt/src/Makefile.am index 20d7bdcb5..fdd6af547 100644 --- a/lbtt/src/Makefile.am +++ b/lbtt/src/Makefile.am @@ -1,20 +1,57 @@ bin_PROGRAMS = lbtt lbtt-translate -lbtt_SOURCES = Alloc.h BitArray.h Bitset.h BitArray.cc BuchiAutomaton.h \ -BuchiAutomaton.cc Config-parse.yy Config-lex.ll Configuration.h \ -Configuration.cc DispUtil.h DispUtil.cc EdgeContainer.h Exception.h \ -FormulaRandomizer.h FormulaRandomizer.cc FormulaWriter.h LtlFormula.h \ -LtlFormula.cc main.cc PathEvaluator.h PathEvaluator.cc PathIterator.h \ -PathIterator.cc ProductAutomaton.h ProductAutomaton.cc Random.h SccIterator.h \ -SharedTestData.h StatDisplay.h StatDisplay.cc StateSpace.h StateSpace.cc \ -StateSpaceRandomizer.h StateSpaceRandomizer.cc StringUtil.h StringUtil.cc \ -TestOperations.h TestOperations.cc TestRoundInfo.h TestStatistics.h \ -TestStatistics.cc UserCommandReader.h UserCommandReader.cc UserCommands.h \ -UserCommands.cc +lbtt_SOURCES = \ + BitArray.cc \ + BitArray.h \ + Bitset.h \ + BuchiAutomaton.cc \ + BuchiAutomaton.h \ + Config-lex.ll \ + Config-parse.yy \ + Configuration.cc \ + Configuration.h \ + DispUtil.cc \ + DispUtil.h \ + EdgeContainer.h \ + Exception.h \ + FormulaRandomizer.cc \ + FormulaRandomizer.h \ + FormulaWriter.h \ + LtlFormula.cc \ + LtlFormula.h \ + main.cc \ + ObstackAlloc.h \ + PathEvaluator.cc \ + PathEvaluator.h \ + PathIterator.cc \ + PathIterator.h \ + ProductAutomaton.cc \ + ProductAutomaton.h \ + Random.h \ + SccIterator.h \ + SharedTestData.h \ + StatDisplay.cc \ + StatDisplay.h \ + StateSpace.cc \ + StateSpace.h \ + StateSpaceRandomizer.cc \ + StateSpaceRandomizer.h \ + StringUtil.cc \ + StringUtil.h \ + TestOperations.cc \ + TestOperations.h \ + TestRoundInfo.h \ + TestStatistics.cc \ + TestStatistics.h \ + UserCommandReader.cc \ + UserCommandReader.h \ + UserCommands.cc \ + UserCommands.h + EXTRA_lbtt_SOURCES = gnu-getopt.h Config-parse.h -lbtt_LDADD = @LIBOBJS@ @READLINELIBS@ +lbtt_LDADD = $(LIBOBJS) $(READLINELIBS) lbtt_translate_SOURCES = \ - Alloc.h \ + ObstackAlloc.h \ BitArray.h \ BitArray.cc \ Exception.h \ @@ -39,4 +76,4 @@ lbtt_translate_SOURCES = \ TranslatorInterface.h EXTRA_lbtt_translate_SOURCES = gnu-getopt.h NeverClaim-parse.h -lbtt_translate_LDADD = @LIBOBJS@ +lbtt_translate_LDADD = $(LIBOBJS) diff --git a/lbtt/src/NeverClaimAutomaton.h b/lbtt/src/NeverClaimAutomaton.h index 6f93881f0..6b230cd65 100644 --- a/lbtt/src/NeverClaimAutomaton.h +++ b/lbtt/src/NeverClaimAutomaton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Exception.h" using namespace std; diff --git a/lbtt/src/Alloc.h b/lbtt/src/ObstackAlloc.h similarity index 100% rename from lbtt/src/Alloc.h rename to lbtt/src/ObstackAlloc.h diff --git a/lbtt/src/PathEvaluator.h b/lbtt/src/PathEvaluator.h index f8ff84091..74693cc50 100644 --- a/lbtt/src/PathEvaluator.h +++ b/lbtt/src/PathEvaluator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BitArray.h" #include "Exception.h" #include "LtlFormula.h" diff --git a/lbtt/src/ProductAutomaton.h b/lbtt/src/ProductAutomaton.h index ccd567468..962829689 100644 --- a/lbtt/src/ProductAutomaton.h +++ b/lbtt/src/ProductAutomaton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BitArray.h" #include "BuchiAutomaton.h" #include "EdgeContainer.h" diff --git a/lbtt/src/SccIterator.h b/lbtt/src/SccIterator.h index 838008c42..87e174e72 100644 --- a/lbtt/src/SccIterator.h +++ b/lbtt/src/SccIterator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Graph.h" using namespace std; diff --git a/lbtt/src/SharedTestData.h b/lbtt/src/SharedTestData.h index ff4cd9209..77bace624 100644 --- a/lbtt/src/SharedTestData.h +++ b/lbtt/src/SharedTestData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #define SHAREDTESTDATA_H #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Exception.h" #include "TestRoundInfo.h" #include "TestStatistics.h" diff --git a/lbtt/src/StatDisplay.h b/lbtt/src/StatDisplay.h index 83469a460..d44c4d8ae 100644 --- a/lbtt/src/StatDisplay.h +++ b/lbtt/src/StatDisplay.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Configuration.h" #include "TestStatistics.h" diff --git a/lbtt/src/StateSpace.h b/lbtt/src/StateSpace.h index fc356ba1b..b25eb51b8 100644 --- a/lbtt/src/StateSpace.h +++ b/lbtt/src/StateSpace.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ #endif /* __GNUC__ */ #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BitArray.h" #include "EdgeContainer.h" #include "Graph.h" diff --git a/lbtt/src/StateSpaceRandomizer.cc b/lbtt/src/StateSpaceRandomizer.cc index 550f418c4..6a4db5d83 100644 --- a/lbtt/src/StateSpaceRandomizer.cc +++ b/lbtt/src/StateSpaceRandomizer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BitArray.h" #include "Exception.h" #include "StateSpaceRandomizer.h" diff --git a/lbtt/src/StringUtil.h b/lbtt/src/StringUtil.h index 8b1623352..271d07ddb 100644 --- a/lbtt/src/StringUtil.h +++ b/lbtt/src/StringUtil.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -33,7 +33,7 @@ #include #endif /* HAVE_SSTREAM */ #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Exception.h" using namespace std; diff --git a/lbtt/src/TestOperations.h b/lbtt/src/TestOperations.h index 314690614..23e84469d 100644 --- a/lbtt/src/TestOperations.h +++ b/lbtt/src/TestOperations.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Configuration.h" #include "Exception.h" #include "StateSpace.h" diff --git a/lbtt/src/TestRoundInfo.h b/lbtt/src/TestRoundInfo.h index b77e7f674..83edb0d9c 100644 --- a/lbtt/src/TestRoundInfo.h +++ b/lbtt/src/TestRoundInfo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Exception.h" #include "LtlFormula.h" #include "ProductAutomaton.h" diff --git a/lbtt/src/TestStatistics.h b/lbtt/src/TestStatistics.h index 75a4c7c3f..d71176ddd 100644 --- a/lbtt/src/TestStatistics.h +++ b/lbtt/src/TestStatistics.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BuchiAutomaton.h" #include "Configuration.h" #include "ProductAutomaton.h" diff --git a/lbtt/src/UserCommandReader.h b/lbtt/src/UserCommandReader.h index da087daca..218a8a438 100644 --- a/lbtt/src/UserCommandReader.h +++ b/lbtt/src/UserCommandReader.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Configuration.h" #include "Exception.h" diff --git a/lbtt/src/UserCommands.h b/lbtt/src/UserCommands.h index 02b7a0925..368c00a22 100644 --- a/lbtt/src/UserCommands.h +++ b/lbtt/src/UserCommands.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000, 2001, 2002 + * Copyright (C) 1999, 2000, 2001, 2002, 2003 * Heikki Tauriainen * * This program is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ #include #include #include -#include "Alloc.h" +#include "ObstackAlloc.h" #include "BuchiAutomaton.h" #include "Configuration.h" #include "ProductAutomaton.h" diff --git a/lbtt/src/main.cc b/lbtt/src/main.cc index 3510e176d..d1b0693ad 100644 --- a/lbtt/src/main.cc +++ b/lbtt/src/main.cc @@ -28,7 +28,7 @@ #include #include #endif /* HAVE_READLINE */ -#include "Alloc.h" +#include "ObstackAlloc.h" #include "Configuration.h" #include "DispUtil.h" #include "Exception.h"