* mln/core/macros.hh
(mln_citer, mln_citer_)
(mln_fwd_citer, mln_fwd_citer_, mln_bkd_citer, mln_bkd_citer_)
(mln_fiter, mln_fiter_)
(mln_fwd_fiter, mln_fwd_fiter_, mln_bkd_fiter, mln_bkd_fiter_):
Remove macros.
* tests/topo/complex.cc: Adjust.
---
milena/ChangeLog | 12 ++++++++++++
milena/mln/core/macros.hh | 36 ------------------------------------
milena/tests/topo/complex.cc | 4 ++--
3 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 36b4640..77f42ad 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,17 @@
2008-09-29 Roland Levillain <roland(a)lrde.epita.fr>
+ Remove macros mln_*[cf]iter.
+
+ * mln/core/macros.hh
+ (mln_citer, mln_citer_)
+ (mln_fwd_citer, mln_fwd_citer_, mln_bkd_citer, mln_bkd_citer_)
+ (mln_fiter, mln_fiter_)
+ (mln_fwd_fiter, mln_fwd_fiter_, mln_bkd_fiter, mln_bkd_fiter_):
+ Remove macros.
+ * tests/topo/complex.cc: Adjust.
+
+2008-09-29 Roland Levillain <roland(a)lrde.epita.fr>
+
Add (dynamic) iterators on n-faces.
* mln/core/internal/p_complex_piter_base.hh
diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh
index 5d6af75..b2cf7fc 100644
--- a/milena/mln/core/macros.hh
+++ b/milena/mln/core/macros.hh
@@ -49,12 +49,6 @@
// b
-/// Shortcuts to access the bkd_citer type associated to T.
-/// \{
-# define mln_bkd_citer(T) typename T::bkd_citer
-# define mln_bkd_citer_(T) T::bkd_citer
-/// \}
-
/// Shortcuts to access the element-backward-iterator type associated
/// to T.
/// \{
@@ -62,12 +56,6 @@
# define mln_bkd_eiter_(T) T::bkd_eiter
/// \}
-/// Shortcuts to access the (N-faces) bkd_fiter type associated to T.
-/// \{
-# define mln_bkd_fiter(N, T) typename T::template bkd_fiter< N >::ret
-# define mln_bkd_fiter_(N, T) T:: bkd_fiter< N >::ret
-/// \}
-
/// Shortcuts to access the bkd_niter type associated to T.
/// \{
# define mln_bkd_niter(T) typename T::bkd_niter
@@ -101,12 +89,6 @@
// c
-/// Shortcuts to access the citer type associated to T.
-/// \{
-# define mln_citer(T) typename T::fwd_citer
-# define mln_citer_(T) T::fwd_citer
-/// \}
-
/// Shortcuts to access the coord type associated to T.
/// \{
# define mln_coord(T) typename T::coord
@@ -164,18 +146,6 @@
// f
-/// Shortcuts to access the (N-faces) fiter type associated to T.
-/// \{
-# define mln_fiter(N, T) typename T::template fwd_fiter< N >::ret
-# define mln_fiter_(N, T) T:: fwd_fiter< N >::ret
-/// \}
-
-/// Shortcuts to access the fwd_citer type associated to T.
-/// \{
-# define mln_fwd_citer(T) typename T::fwd_citer
-# define mln_fwd_citer_(T) T::fwd_citer
-/// \}
-
/// Shortcuts to access the element-forward-iterator type associated
/// to T.
/// \{
@@ -183,12 +153,6 @@
# define mln_fwd_eiter_(T) T::fwd_eiter
/// \}
-/// Shortcuts to access the (N-faces) fwd_fiter type associated to T.
-/// \{
-# define mln_fwd_fiter(N, T) typename T::template fwd_fiter< N >::ret
-# define mln_fwd_fiter_(N, T) T:: fwd_fiter< N >::ret
-/// \}
-
/// Shortcuts to access the fwd_niter type associated to T.
/// \{
# define mln_fwd_niter(T) typename T::fwd_niter
diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc
index 782bf97..deafb57 100644
--- a/milena/tests/topo/complex.cc
+++ b/milena/tests/topo/complex.cc
@@ -133,8 +133,8 @@ int main()
// Iterators on a complex (not complex_image), or more precisely on
// (all) the faces of complex C.
- mln_fwd_citer_(topo::complex<D>) fwd_f(c);
- mln_bkd_citer_(topo::complex<D>) bkd_f(c);
+ topo::face_fwd_iter<D> fwd_f(c);
+ topo::face_bkd_iter<D> bkd_f(c);
for_all_2(fwd_f, bkd_f)
std::cout << fwd_f << ' ' << bkd_f << std::endl;
std::cout << std::endl;
--
1.5.6.5
Show replies by date