From d107e64f011313c550f4f42d93c9281ff81be24e Mon Sep 17 00:00:00 2001
From: Dennis Klein <d.klein@gsi.de>
Date: Wed, 5 Apr 2023 13:34:45 +0200
Subject: [PATCH] feat!: Make `Device::fChannels` private

BREAKING CHANGE
---
 fairmq/Device.cxx |  8 --------
 fairmq/Device.h   | 11 +++--------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/fairmq/Device.cxx b/fairmq/Device.cxx
index c27ea8b5..0c31dc98 100644
--- a/fairmq/Device.cxx
+++ b/fairmq/Device.cxx
@@ -77,9 +77,6 @@ Device::Device(ProgOptions& config, tools::Version version)
     : Device(&config, version)
 {}
 
-/// TODO: Remove this once Device::fChannels is no longer public
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 Device::Device(ProgOptions* config, tools::Version version)
     : fTransportFactory(nullptr)
     , fInternalConfig(config ? nullptr : make_unique<ProgOptions>())
@@ -140,7 +137,6 @@ Device::Device(ProgOptions* config, tools::Version version)
 
     fStateMachine.Start();
 }
-#pragma GCC diagnostic pop
 
 void Device::InitWrapper()
 {
@@ -749,15 +745,11 @@ void Device::ResetWrapper()
     }
 }
 
-/// TODO: Remove this once Device::fChannels is no longer public
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 Device::~Device()
 {
     UnsubscribeFromNewTransition("device");
     fStateMachine.StopHandlingStates();
     LOG(debug) << "Shutting down device " << fId;
 }
-#pragma GCC diagnostic pop
 
 } // namespace fair::mq
diff --git a/fairmq/Device.h b/fairmq/Device.h
index 26827f1f..0d9cb3c7 100644
--- a/fairmq/Device.h
+++ b/fairmq/Device.h
@@ -426,22 +426,17 @@ class Device
     std::unordered_map<mq::Transport, std::shared_ptr<TransportFactory>>
         fTransports;   ///< Container for transports
 
-  public:
-    [[deprecated("Use GetChannels() instead.")]]
+  private:
     std::unordered_map<std::string, std::vector<Channel>> fChannels;   ///< Device channels
+
+  public:
     std::unordered_map<std::string, std::vector<Channel>>& GetChannels()
     {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         return fChannels;
-#pragma GCC diagnostic pop
     }
     std::unordered_map<std::string, std::vector<Channel>> const& GetChannels() const
     {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         return fChannels;
-#pragma GCC diagnostic pop
     }
 
     std::unique_ptr<ProgOptions> fInternalConfig;   ///< Internal program options configuration