diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt index 18c2a0d8..86229572 100644 --- a/fairmq/CMakeLists.txt +++ b/fairmq/CMakeLists.txt @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (C) 2012-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH # +# Copyright (C) 2012-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH # # # # This software is distributed under the terms of the # # GNU Lesser General Public Licence (LGPL) version 3, # @@ -32,15 +32,6 @@ if(BUILD_FAIRMQ) DeviceRunner.h Error.h EventManager.h - FairMQChannel.h - FairMQDevice.h - FairMQLogger.h - FairMQMessage.h - FairMQParts.h - FairMQPoller.h - FairMQSocket.h - FairMQTransportFactory.h - FairMQUnmanagedRegion.h FwdDecls.h JSONParser.h MemoryResourceTools.h @@ -64,7 +55,6 @@ if(BUILD_FAIRMQ) TransportFactory.h Transports.h UnmanagedRegion.h - options/FairMQProgOptions.h runDevice.h runFairMQDevice.h shmem/Common.h @@ -183,7 +173,6 @@ if(BUILD_FAIRMQ) $ $ $ - $ $ ) diff --git a/fairmq/Channel.h b/fairmq/Channel.h index 411ba588..d4597a29 100644 --- a/fairmq/Channel.h +++ b/fairmq/Channel.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -484,6 +484,4 @@ class Channel } // namespace fair::mq -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 327d0758..4487e44d 100644 --- a/fairmq/Device.h +++ b/fairmq/Device.h @@ -683,9 +683,4 @@ 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; - #endif /* FAIR_MQ_DEVICE_H */ diff --git a/fairmq/Error.h b/fairmq/Error.h index 0d06f132..7a2bd786 100644 --- a/fairmq/Error.h +++ b/fairmq/Error.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h deleted file mode 100644 index 3f500bb0..00000000 --- a/fairmq/FairMQChannel.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * 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, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQCHANNEL_H_ -#define FAIRMQCHANNEL_H_ - -#ifndef FAIR_MQ_CHANNEL_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQCHANNEL_H_ */ diff --git a/fairmq/FairMQDevice.h b/fairmq/FairMQDevice.h deleted file mode 100644 index 24c60862..00000000 --- a/fairmq/FairMQDevice.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * Copyright (C) 2012-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * - * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQDEVICE_H_ -#define FAIRMQDEVICE_H_ - -#ifndef FAIR_MQ_DEVICE_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQDEVICE_H_ */ diff --git a/fairmq/FairMQLogger.h b/fairmq/FairMQLogger.h deleted file mode 100644 index 0d5f63dd..00000000 --- a/fairmq/FairMQLogger.h +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************** - * Copyright (C) 2017-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * - * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQLOGGER_H_ -#define FAIRMQLOGGER_H_ - -#pragma GCC warning "Deprecated header: Use instead" - -#include - -#endif /* FAIRMQLOGGER_H_ */ diff --git a/fairmq/FairMQMessage.h b/fairmq/FairMQMessage.h deleted file mode 100644 index 3ab7bdd8..00000000 --- a/fairmq/FairMQMessage.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * 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, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQMESSAGE_H_ -#define FAIRMQMESSAGE_H_ - -#ifndef FAIR_MQ_MESSAGE_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQMESSAGE_H_ */ diff --git a/fairmq/FairMQParts.h b/fairmq/FairMQParts.h deleted file mode 100644 index ebdf636e..00000000 --- a/fairmq/FairMQParts.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * 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, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQPARTS_H_ -#define FAIRMQPARTS_H_ - -#ifndef FAIR_MQ_PARTS_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQPARTS_H_ */ diff --git a/fairmq/FairMQPoller.h b/fairmq/FairMQPoller.h deleted file mode 100644 index 432b686c..00000000 --- a/fairmq/FairMQPoller.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * 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, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQPOLLER_H_ -#define FAIRMQPOLLER_H_ - -#ifndef FAIR_MQ_POLLER_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQPOLLER_H_ */ diff --git a/fairmq/FairMQSocket.h b/fairmq/FairMQSocket.h deleted file mode 100644 index 5c81e480..00000000 --- a/fairmq/FairMQSocket.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * 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, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQSOCKET_H_ -#define FAIRMQSOCKET_H_ - -#ifndef FAIR_MQ_SOCKET_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQSOCKET_H_ */ diff --git a/fairmq/FairMQTransportFactory.h b/fairmq/FairMQTransportFactory.h deleted file mode 100644 index 3d2a536f..00000000 --- a/fairmq/FairMQTransportFactory.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * 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, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQTRANSPORTFACTORY_H_ -#define FAIRMQTRANSPORTFACTORY_H_ - -#ifndef FAIR_MQ_TRANSPORTFACTORY_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQTRANSPORTFACTORY_H_ */ diff --git a/fairmq/FairMQUnmanagedRegion.h b/fairmq/FairMQUnmanagedRegion.h deleted file mode 100644 index c9a9a31e..00000000 --- a/fairmq/FairMQUnmanagedRegion.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * 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, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQUNMANAGEDREGION_H_ -#define FAIRMQUNMANAGEDREGION_H_ - -#ifndef FAIR_MQ_UNMANAGEDREGION_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQUNMANAGEDREGION_H_ */ diff --git a/fairmq/FwdDecls.h b/fairmq/FwdDecls.h index cdab35f0..3acc99a6 100644 --- a/fairmq/FwdDecls.h +++ b/fairmq/FwdDecls.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -26,20 +26,6 @@ class Socket; class TransportFactory; class UnmanagedRegion; -using FairMQMemoryResource = MemoryResource; - } // namespace fair::mq -using FairMQChannel = fair::mq::Channel; -using FairMQDevice = fair::mq::Device; -using FairMQMessage = fair::mq::Message; -using FairMQParts = fair::mq::Parts; -using FairMQPoller = fair::mq::Poller; -using FairMQRegionBlock = fair::mq::RegionBlock; -using FairMQRegionConfig = fair::mq::RegionConfig; -using FairMQRegionInfo = fair::mq::RegionInfo; -using FairMQSocket = fair::mq::Socket; -using FairMQTransportFactory = fair::mq::TransportFactory; -using FairMQUnmanagedRegion = fair::mq::UnmanagedRegion; - #endif // FAIR_MQ_FWDDECLS_H diff --git a/fairmq/MemoryResources.h b/fairmq/MemoryResources.h index 1547459e..df8399d2 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-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2018-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -103,8 +103,6 @@ class ChannelResource : public MemoryResource }; }; -using FairMQMemoryResource [[deprecated("Use fair::mq::MemoryResource")]] = MemoryResource; - } // namespace fair::mq #endif /* FAIR_MQ_MEMORY_RESOURCES_H */ diff --git a/fairmq/Message.h b/fairmq/Message.h index 9b57318a..7fdb2693 100644 --- a/fairmq/Message.h +++ b/fairmq/Message.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -78,8 +78,4 @@ 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; - #endif // FAIR_MQ_MESSAGE_H diff --git a/fairmq/Parts.h b/fairmq/Parts.h index 4c0cbc39..ceb4483a 100644 --- a/fairmq/Parts.h +++ b/fairmq/Parts.h @@ -92,6 +92,4 @@ struct Parts } // namespace fair::mq -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 a35c9cc2..178c47d2 100644 --- a/fairmq/Poller.h +++ b/fairmq/Poller.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -41,7 +41,4 @@ 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; - #endif // FAIR_MQ_POLLER_H diff --git a/fairmq/ProgOptionsFwd.h b/fairmq/ProgOptionsFwd.h index b1b5e065..f3546f76 100644 --- a/fairmq/ProgOptionsFwd.h +++ b/fairmq/ProgOptionsFwd.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2019-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2019-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -13,6 +13,4 @@ namespace fair::mq { class 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 4c0dcd91..3989d02b 100644 --- a/fairmq/Socket.h +++ b/fairmq/Socket.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -103,7 +103,4 @@ 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; - #endif // FAIR_MQ_SOCKET_H diff --git a/fairmq/TransportFactory.h b/fairmq/TransportFactory.h index 04431d7b..b7487379 100644 --- a/fairmq/TransportFactory.h +++ b/fairmq/TransportFactory.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -241,7 +241,4 @@ 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; - #endif // FAIR_MQ_TRANSPORTFACTORY_H diff --git a/fairmq/UnmanagedRegion.h b/fairmq/UnmanagedRegion.h index 0b5aee47..4f9d698e 100644 --- a/fairmq/UnmanagedRegion.h +++ b/fairmq/UnmanagedRegion.h @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -141,14 +141,4 @@ struct RegionConfig } // namespace fair::mq -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 diff --git a/fairmq/options/FairMQProgOptions.h b/fairmq/options/FairMQProgOptions.h deleted file mode 100644 index 20ca1673..00000000 --- a/fairmq/options/FairMQProgOptions.h +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************** - * 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, * - * copied verbatim in the file "LICENSE" * - ********************************************************************************/ - -#ifndef FAIRMQPROGOPTIONS_H -#define FAIRMQPROGOPTIONS_H - -#ifndef FAIR_MQ_PROGOPTIONS_H -#pragma GCC warning "Deprecated header: Use instead" -#endif - -#include - -#endif /* FAIRMQPROGOPTIONS_H */