https://svn.lrde.epita.fr/svn/oln/trunk/olena
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Simplfy header inclusions of oln::image[123]d.
* oln/core/1d/image1d.hh (oln/core/1d/topo1d.hh): Include it.
(oln/core/gen/topo_lbbox.hh, oln/core/1d/aliases.hh): No longer
include them.
* oln/core/2d/image2d.hh (oln/core/2d/topo2d.hh): Include it.
(oln/core/gen/topo_lbbox.hh, oln/core/2d/aliases.hh): No longer
include them.
* oln/core/3d/image3d.hh (oln/core/3d/topo3d.hh): Include it.
(oln/core/gen/topo_lbbox.hh, oln/core/3d/aliases.hh): No longer
include them.
1d/image1d.hh | 5 +----
2d/image2d.hh | 5 +----
3d/image3d.hh | 5 +----
3 files changed, 3 insertions(+), 12 deletions(-)
Index: oln/core/1d/image1d.hh
--- oln/core/1d/image1d.hh (revision 665)
+++ oln/core/1d/image1d.hh (working copy)
@@ -31,14 +31,11 @@
# include <oln/core/image_entry.hh>
# include <oln/core/gen/grid.hh>
-# include <oln/core/gen/topo_lbbox.hh>
# include <oln/core/internal/tracked_ptr.hh>
# include <oln/core/1d/array1d.hh>
# include <oln/core/1d/point1d.hh>
-// For topo1d.
-# include <oln/core/1d/aliases.hh>
+# include <oln/core/1d/topo1d.hh>
// For fwd_piter and bkd_piter virtual types.
-// FIXME: Really necessary?
# include <oln/core/iterator_vtypes.hh>
Index: oln/core/2d/image2d.hh
--- oln/core/2d/image2d.hh (revision 665)
+++ oln/core/2d/image2d.hh (working copy)
@@ -31,14 +31,11 @@
# include <oln/core/image_entry.hh>
# include <oln/core/gen/grid.hh>
-# include <oln/core/gen/topo_lbbox.hh>
# include <oln/core/internal/tracked_ptr.hh>
# include <oln/core/2d/array2d.hh>
# include <oln/core/2d/point2d.hh>
-// For topo2d.
-# include <oln/core/2d/aliases.hh>
+# include <oln/core/2d/topo2d.hh>
// For fwd_piter and bkd_piter virtual types.
-// FIXME: Really necessary?
# include <oln/core/iterator_vtypes.hh>
Index: oln/core/3d/image3d.hh
--- oln/core/3d/image3d.hh (revision 665)
+++ oln/core/3d/image3d.hh (working copy)
@@ -31,14 +31,11 @@
# include <oln/core/image_entry.hh>
# include <oln/core/gen/grid.hh>
-# include <oln/core/gen/topo_lbbox.hh>
# include <oln/core/internal/tracked_ptr.hh>
# include <oln/core/3d/array3d.hh>
# include <oln/core/3d/point3d.hh>
-// For topo3d.
-# include <oln/core/3d/aliases.hh>
+# include <oln/core/3d/topo3d.hh>
// For fwd_piter and bkd_piter virtual types.
-// FIXME: Really necessary?
# include <oln/core/iterator_vtypes.hh>