diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am index 4812bdcf3..8cad56c5a 100644 --- a/src/misc/Makefile.am +++ b/src/misc/Makefile.am @@ -30,7 +30,6 @@ DISTCLEANFILES = _config.h misc_HEADERS = \ bareword.hh \ - bddalloc.hh \ bddlt.hh \ bddop.hh \ casts.hh \ @@ -38,7 +37,6 @@ misc_HEADERS = \ escape.hh \ fixpool.hh \ formater.hh \ - freelist.hh \ hash.hh \ hashfunc.hh \ intvcomp.hh \ @@ -56,11 +54,9 @@ misc_HEADERS = \ noinst_LTLIBRARIES = libmisc.la libmisc_la_SOURCES = \ bareword.cc \ - bddalloc.cc \ bddop.cc \ escape.cc \ formater.cc \ - freelist.cc \ intvcomp.cc \ intvcmp2.cc \ memusage.cc \ diff --git a/src/priv/Makefile.am b/src/priv/Makefile.am index 2d5c7d56f..bb2bce145 100644 --- a/src/priv/Makefile.am +++ b/src/priv/Makefile.am @@ -22,10 +22,15 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(VISIBILITY_CXXFLAGS) noinst_HEADERS = \ acccompl.hh \ - accconv.hh + accconv.hh \ + bddalloc.hh \ + freelist.hh noinst_LTLIBRARIES = libpriv.la libpriv_la_SOURCES = \ acccompl.cc \ - accconv.cc + accconv.cc \ + bddalloc.cc \ + freelist.cc + diff --git a/src/misc/bddalloc.cc b/src/priv/bddalloc.cc similarity index 100% rename from src/misc/bddalloc.cc rename to src/priv/bddalloc.cc diff --git a/src/misc/bddalloc.hh b/src/priv/bddalloc.hh similarity index 85% rename from src/misc/bddalloc.hh rename to src/priv/bddalloc.hh index 0ad255f61..58a7737ad 100644 --- a/src/misc/bddalloc.hh +++ b/src/priv/bddalloc.hh @@ -1,5 +1,8 @@ +// -*- coding: utf-8 -*- +// Copyright (C) 2013 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 +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -17,8 +20,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#ifndef SPOT_MISC_BDDALLOC_HH -# define SPOT_MISC_BDDALLOC_HH +#ifndef SPOT_PRIV_BDDALLOC_HH +# define SPOT_PRIV_BDDALLOC_HH #include "freelist.hh" #include @@ -52,4 +55,4 @@ namespace spot } -#endif // SPOT_MISC_BDDALLOC_HH +#endif // SPOT_PRIV_BDDALLOC_HH diff --git a/src/misc/freelist.cc b/src/priv/freelist.cc similarity index 100% rename from src/misc/freelist.cc rename to src/priv/freelist.cc diff --git a/src/misc/freelist.hh b/src/priv/freelist.hh similarity index 90% rename from src/misc/freelist.hh rename to src/priv/freelist.hh index add213c77..f792378ff 100644 --- a/src/misc/freelist.hh +++ b/src/priv/freelist.hh @@ -1,7 +1,8 @@ -// Copyright (C) 2008 Laboratoire de Recherche et Développement +// -*- coding: utf-8 -*- +// Copyright (C) 2008,2013 Laboratoire de Recherche et Développement // de l'Epita (LRDE). // Copyright (C) 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6), -// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // // This file is part of Spot, a model checking library. @@ -20,8 +21,8 @@ // along with this program. If not, see . -#ifndef SPOT_MISC_FREELIST_HH -# define SPOT_MISC_FREELIST_HH +#ifndef SPOT_PRIV_FREELIST_HH +# define SPOT_PRIV_FREELIST_HH #include #include @@ -81,4 +82,4 @@ namespace spot } -#endif // SPOT_MISC_FREELIST_HH +#endif // SPOT_PRIV_FREELIST_HH diff --git a/src/tgba/bdddict.cc b/src/tgba/bdddict.cc index a51c5b9c4..b65c40e18 100644 --- a/src/tgba/bdddict.cc +++ b/src/tgba/bdddict.cc @@ -27,7 +27,7 @@ #include #include #include -#include "misc/bddalloc.hh" +#include "priv/bddalloc.hh" #include "bdddict.hh" namespace spot diff --git a/src/tgbaalgos/ltl2tgba_fm.cc b/src/tgbaalgos/ltl2tgba_fm.cc index 290f3b6b5..bde8ec011 100644 --- a/src/tgbaalgos/ltl2tgba_fm.cc +++ b/src/tgbaalgos/ltl2tgba_fm.cc @@ -21,7 +21,6 @@ // along with this program. If not, see . #include "misc/hash.hh" -#include "misc/bddalloc.hh" #include "misc/bddlt.hh" #include "misc/minato.hh" #include "ltlast/visitor.hh"