From b38bb1786983cd04c54ec57dc21d3f8a061e5f74 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 18 Nov 2020 17:45:21 +0100 Subject: [PATCH] Intel icc doesn't like attribute [[deprecated]] with "using". --- 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 23695038ab..a030f0b812 100644 --- a/include/simgrid/Exception.hpp +++ b/include/simgrid/Exception.hpp @@ -113,7 +113,7 @@ public: ~TimeoutException() override; }; -using TimeoutError XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::TimeoutException") = TimeoutException; +XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::TimeoutException") typedef TimeoutException TimeoutError; /** Exception raised when a host fails */ class HostFailureException : public Exception { @@ -239,6 +239,6 @@ private: } // namespace simgrid -using xbt_ex XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::Exception") = simgrid::Exception; +XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::Exception") typedef simgrid::Exception xbt_ex; #endif diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 73212dcc67..99509bc076 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*; -using e_smx_state_t XBT_ATTRIB_DEPRECATED_v330("Please use kernel::activity::State") = simgrid::kernel::activity::State; +XBT_ATTRIB_DEPRECATED_v330("Please use kernel::activity::State") typedef simgrid::kernel::activity::State e_smx_state_t; #else typedef struct s4u_Actor s4u_Actor; -- 2.20.1