From c2525c3b833fd682882943fe047f2d77e1bae5e8 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 25 Mar 2018 15:07:26 +0200 Subject: [PATCH] kill typedef lmm_element_t --- include/simgrid/forward.h | 1 - src/kernel/lmm/maxmin.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 8f71d15f34..69ef8e46c5 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -99,7 +99,6 @@ typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t; typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t; typedef simgrid::surf::StorageImpl* surf_storage_t; -typedef simgrid::kernel::lmm::Element* lmm_element_t; typedef const simgrid::kernel::lmm::Element* const_lmm_element_t; typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t; diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index c3b1668b0b..aace67e8f7 100644 --- a/src/kernel/lmm/maxmin.cpp +++ b/src/kernel/lmm/maxmin.cpp @@ -817,12 +817,12 @@ void System::on_disabled_var(Constraint* cnstr) if (not numelem) return; - lmm_element_t elem = &cnstr->disabled_element_set.front(); + Element* elem = &cnstr->disabled_element_set.front(); // Cannot use foreach loop, because System::enable_var() will modify disabled_element_set.. within the loop while (numelem-- && elem) { - lmm_element_t nextelem; + Element* nextelem; if (elem->disabled_element_set_hook.is_linked()) { auto iter = std::next(cnstr->disabled_element_set.iterator_to(*elem)); nextelem = iter != std::end(cnstr->disabled_element_set) ? &*iter : nullptr; -- 2.20.1