diff --git a/fairmq/Channel.h b/fairmq/Channel.h index 35e06c18..c72e777d 100644 --- a/fairmq/Channel.h +++ b/fairmq/Channel.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -475,7 +475,6 @@ class Channel } // namespace fair::mq -// using FairMQChannel [[deprecated("Use fair::mq::Channel")]] = fair::mq::Channel; -using FairMQChannel = fair::mq::Channel; +using FairMQChannel [[deprecated("Use fair::mq::Channel")]] = fair::mq::Channel; #endif // FAIR_MQ_CHANNEL_H diff --git a/fairmq/Device.h b/fairmq/Device.h index da4342c1..e7b0b8bb 100644 --- a/fairmq/Device.h +++ b/fairmq/Device.h @@ -635,15 +635,9 @@ class Device } // namespace fair::mq -// using FairMQChannelMap [[deprecated("Use fair::mq::ChannelMap")]] = fair::mq::ChannelMap; -// using InputMsgCallback [[deprecated("Use fair::mq::InputMsgCallback")]] = - // fair::mq::InputMsgCallback; -// using InputMultipartCallback [[deprecated("Use fair::mq::InputMultipartCallback")]] = - // fair::mq::InputMultipartCallback; -// using FairMQDevice [[deprecated("Use fair::mq::Device")]] = fair::mq::Device; -using FairMQChannelMap = fair::mq::ChannelMap; -using InputMsgCallback = fair::mq::InputMsgCallback; -using InputMultipartCallback = fair::mq::InputMultipartCallback; -using FairMQDevice = fair::mq::Device; +using FairMQChannelMap [[deprecated("Use fair::mq::ChannelMap")]] = fair::mq::ChannelMap; +using InputMsgCallback [[deprecated("Use fair::mq::InputMsgCallback")]] = fair::mq::InputMsgCallback; +using InputMultipartCallback [[deprecated("Use fair::mq::InputMultipartCallback")]] = fair::mq::InputMultipartCallback; +using FairMQDevice [[deprecated("Use fair::mq::Device")]] = fair::mq::Device; #endif /* FAIR_MQ_DEVICE_H */ diff --git a/fairmq/MemoryResources.h b/fairmq/MemoryResources.h index d44ec2d5..1547459e 100644 --- a/fairmq/MemoryResources.h +++ b/fairmq/MemoryResources.h @@ -1,6 +1,6 @@ /******************************************************************************** * Copyright (C) 2018 CERN and copyright holders of ALICE O2 * - * Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2018-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -103,9 +103,7 @@ class ChannelResource : public MemoryResource }; }; -// using FairMQMemoryResource [[deprecated("Use fair::mq::MemoryResource")]] = - // MemoryResource; -using FairMQMemoryResource = MemoryResource; +using FairMQMemoryResource [[deprecated("Use fair::mq::MemoryResource")]] = MemoryResource; } // namespace fair::mq diff --git a/fairmq/Message.h b/fairmq/Message.h index 430e1f6b..9b57318a 100644 --- a/fairmq/Message.h +++ b/fairmq/Message.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -78,11 +78,8 @@ struct MessageBadAlloc : std::runtime_error } // namespace fair::mq -// using fairmq_free_fn [[deprecated("Use fair::mq::FreeFn")]] = fair::mq::FreeFn; -// using FairMQMessage [[deprecated("Use fair::mq::Message")]] = fair::mq::Message; -// using FairMQMessagePtr [[deprecated("Use fair::mq::MessagePtr")]] = fair::mq::MessagePtr; -using fairmq_free_fn = fair::mq::FreeFn; -using FairMQMessage = fair::mq::Message; -using FairMQMessagePtr = fair::mq::MessagePtr; +using fairmq_free_fn [[deprecated("Use fair::mq::FreeFn")]] = fair::mq::FreeFn; +using FairMQMessage [[deprecated("Use fair::mq::Message")]] = fair::mq::Message; +using FairMQMessagePtr [[deprecated("Use fair::mq::MessagePtr")]] = fair::mq::MessagePtr; #endif // FAIR_MQ_MESSAGE_H diff --git a/fairmq/Parts.h b/fairmq/Parts.h index 9ff545ee..a8f5811f 100644 --- a/fairmq/Parts.h +++ b/fairmq/Parts.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -86,7 +86,6 @@ class Parts } // namespace fair::mq -// using FairMQParts [[deprecated("Use fair::mq::Parts")]] = fair::mq::Parts; -using FairMQParts = fair::mq::Parts; +using FairMQParts [[deprecated("Use fair::mq::Parts")]] = fair::mq::Parts; #endif /* FAIR_MQ_PARTS_H */ diff --git a/fairmq/Poller.h b/fairmq/Poller.h index 678d19d8..a35c9cc2 100644 --- a/fairmq/Poller.h +++ b/fairmq/Poller.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -41,9 +41,7 @@ struct PollerError : std::runtime_error } // namespace fair::mq -// using FairMQPoller [[deprecated("Use fair::mq::Poller")]] = fair::mq::Poller; -// using FairMQPollerPtr [[deprecated("Use fair::mq::PollerPtr")]] = fair::mq::PollerPtr; -using FairMQPoller = fair::mq::Poller; -using FairMQPollerPtr = fair::mq::PollerPtr; +using FairMQPoller [[deprecated("Use fair::mq::Poller")]] = fair::mq::Poller; +using FairMQPollerPtr [[deprecated("Use fair::mq::PollerPtr")]] = fair::mq::PollerPtr; #endif // FAIR_MQ_POLLER_H diff --git a/fairmq/ProgOptionsFwd.h b/fairmq/ProgOptionsFwd.h index b0bdeb8a..b1b5e065 100644 --- a/fairmq/ProgOptionsFwd.h +++ b/fairmq/ProgOptionsFwd.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2019-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -13,7 +13,6 @@ namespace fair::mq { class ProgOptions; } -// using FairMQProgOptions [[deprecated("Use fair::mq::ProgOptions")]] = fair::mq::ProgOptions; -using FairMQProgOptions = fair::mq::ProgOptions; +using FairMQProgOptions [[deprecated("Use fair::mq::ProgOptions")]] = fair::mq::ProgOptions; #endif /* FAIR_MQ_PROGOPTIONSFWD_H */ diff --git a/fairmq/Socket.h b/fairmq/Socket.h index 459d7f55..4c0dcd91 100644 --- a/fairmq/Socket.h +++ b/fairmq/Socket.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -103,9 +103,7 @@ struct SocketError : std::runtime_error } // namespace fair::mq -// using FairMQSocket [[deprecated("Use fair::mq::Socket")]] = fair::mq::Socket; -// using FairMQSocketPtr [[deprecated("Use fair::mq::SocketPtr")]] = fair::mq::SocketPtr; -using FairMQSocket = fair::mq::Socket; -using FairMQSocketPtr = fair::mq::SocketPtr; +using FairMQSocket [[deprecated("Use fair::mq::Socket")]] = fair::mq::Socket; +using FairMQSocketPtr [[deprecated("Use fair::mq::SocketPtr")]] = fair::mq::SocketPtr; #endif // FAIR_MQ_SOCKET_H diff --git a/fairmq/TransportFactory.h b/fairmq/TransportFactory.h index ac83b4e7..04431d7b 100644 --- a/fairmq/TransportFactory.h +++ b/fairmq/TransportFactory.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -241,11 +241,7 @@ struct TransportFactoryError : std::runtime_error } // namespace fair::mq -// using FairMQTransportFactory [[deprecated("Use fair::mq::TransportFactory")]] = - // fair::mq::TransportFactory; -// using FairMQTransportFactoryError [[deprecated("Use fair::mq::TransportFactoryError")]] = - // fair::mq::TransportFactoryError; -using FairMQTransportFactory = fair::mq::TransportFactory; -using FairMQTransportFactoryError = fair::mq::TransportFactoryError; +using FairMQTransportFactory [[deprecated("Use fair::mq::TransportFactory")]] = fair::mq::TransportFactory; +using FairMQTransportFactoryError [[deprecated("Use fair::mq::TransportFactoryError")]] = fair::mq::TransportFactoryError; #endif // FAIR_MQ_TRANSPORTFACTORY_H diff --git a/fairmq/UnmanagedRegion.h b/fairmq/UnmanagedRegion.h index 04f9fa8b..0b5aee47 100644 --- a/fairmq/UnmanagedRegion.h +++ b/fairmq/UnmanagedRegion.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -141,23 +141,14 @@ struct RegionConfig } // namespace fair::mq -// using FairMQRegionEvent [[deprecated("Use fair::mq::RegionBlock")]] = fair::mq::RegionEvent; -// using FairMQRegionInfo [[deprecated("Use fair::mq::RegionInfo")]] = fair::mq::RegionInfo; -// using FairMQRegionBlock [[deprecated("Use fair::mq::RegionBlock")]] = fair::mq::RegionBlock; -// using FairMQRegionCallback [[deprecated("Use fair::mq::RegionCallback")]] = fair::mq::RegionCallback; -// using FairMQRegionBulkCallback [[deprecated("Use fair::mq::RegionBulkCallback")]] = fair::mq::RegionBulkCallback; -// using FairMQRegionEventCallback [[deprecated("Use fair::mq::RegionEventCallback")]] = fair::mq::RegionEventCallback; -// using FairMQUnmanagedRegion [[deprecated("Use fair::mq::UnmanagedRegion")]] = fair::mq::UnmanagedRegion; -// using FairMQUnmanagedRegionPtr [[deprecated("Use fair::mq::UnmanagedRegionPtr")]] = fair::mq::UnmanagedRegionPtr; -// using FairMQRegionConfig [[deprecated("Use fair::mq::RegionConfig")]] = fair::mq::RegionConfig; -using FairMQRegionEvent = fair::mq::RegionEvent; -using FairMQRegionInfo = fair::mq::RegionInfo; -using FairMQRegionBlock = fair::mq::RegionBlock; -using FairMQRegionCallback = fair::mq::RegionCallback; -using FairMQRegionBulkCallback = fair::mq::RegionBulkCallback; -using FairMQRegionEventCallback = fair::mq::RegionEventCallback; -using FairMQUnmanagedRegion = fair::mq::UnmanagedRegion; -using FairMQUnmanagedRegionPtr = fair::mq::UnmanagedRegionPtr; -using FairMQRegionConfig = fair::mq::RegionConfig; +using FairMQRegionEvent [[deprecated("Use fair::mq::RegionEvent")]] = fair::mq::RegionEvent; +using FairMQRegionInfo [[deprecated("Use fair::mq::RegionInfo")]] = fair::mq::RegionInfo; +using FairMQRegionBlock [[deprecated("Use fair::mq::RegionBlock")]] = fair::mq::RegionBlock; +using FairMQRegionCallback [[deprecated("Use fair::mq::RegionCallback")]] = fair::mq::RegionCallback; +using FairMQRegionBulkCallback [[deprecated("Use fair::mq::RegionBulkCallback")]] = fair::mq::RegionBulkCallback; +using FairMQRegionEventCallback [[deprecated("Use fair::mq::RegionEventCallback")]] = fair::mq::RegionEventCallback; +using FairMQUnmanagedRegion [[deprecated("Use fair::mq::UnmanagedRegion")]] = fair::mq::UnmanagedRegion; +using FairMQUnmanagedRegionPtr [[deprecated("Use fair::mq::UnmanagedRegionPtr")]] = fair::mq::UnmanagedRegionPtr; +using FairMQRegionConfig [[deprecated("Use fair::mq::RegionConfig")]] = fair::mq::RegionConfig; #endif // FAIR_MQ_UNMANAGEDREGION_H