From af367d06eb795bb1cd41096422d03e5271530b87 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 19 Nov 2020 00:01:48 +0100 Subject: [PATCH] Revert "Intel icc doesn't like attribute [[deprecated]] with "using"." This reverts commit b38bb1786983cd04c54ec57dc21d3f8a061e5f74. --- include/simgrid/Exception.hpp | 4 ++-- include/simgrid/forward.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp index e1798d910e..833cc025d8 100644 --- a/include/simgrid/Exception.hpp +++ b/include/simgrid/Exception.hpp @@ -108,7 +108,7 @@ public: ~TimeoutException() override; }; -XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::TimeoutException") typedef TimeoutException TimeoutError; +using TimeoutError XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::TimeoutException") = TimeoutException; /** Exception raised when a host fails */ class HostFailureException : public Exception { @@ -204,6 +204,6 @@ private: } // namespace simgrid -XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::Exception") typedef simgrid::Exception xbt_ex; +using xbt_ex XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::Exception") = simgrid::Exception; #endif diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 99509bc076..73212dcc67 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -215,7 +215,7 @@ using smx_cond_t = simgrid::kernel::activity::ConditionVariableImpl*; using smx_mailbox_t = simgrid::kernel::activity::MailboxImpl*; using smx_mutex_t = simgrid::kernel::activity::MutexImpl*; using smx_sem_t = simgrid::kernel::activity::SemaphoreImpl*; -XBT_ATTRIB_DEPRECATED_v330("Please use kernel::activity::State") typedef simgrid::kernel::activity::State e_smx_state_t; +using e_smx_state_t XBT_ATTRIB_DEPRECATED_v330("Please use kernel::activity::State") = simgrid::kernel::activity::State; #else typedef struct s4u_Actor s4u_Actor; -- 2.20.1