From c3ba47bd568336052d5e63f4abe7f631d56aeea9 Mon Sep 17 00:00:00 2001
From: Richard Oehlinger <richard@oehli.at>
Date: Thu, 18 Jul 2024 12:02:43 +0200
Subject: [PATCH 1/3] Remove unneeded dependency to Boost.Iostreams.

---
 src/rmq/rmqamqp/rmqamqp_framer.cpp     | 7 -------
 src/rmq/rmqamqpt/rmqamqpt_method.cpp   | 2 --
 src/tests/rmqamqp/rmqamqp_framer.t.cpp | 5 -----
 vcpkg.json                             | 1 -
 4 files changed, 15 deletions(-)

diff --git a/src/rmq/rmqamqp/rmqamqp_framer.cpp b/src/rmq/rmqamqp/rmqamqp_framer.cpp
index 90a1d04d..3b062ec6 100644
--- a/src/rmq/rmqamqp/rmqamqp_framer.cpp
+++ b/src/rmq/rmqamqp/rmqamqp_framer.cpp
@@ -21,9 +21,6 @@
 #include <rmqamqpt_method.h>
 #include <rmqamqpt_types.h>
 
-#include <boost/iostreams/device/back_inserter.hpp>
-#include <boost/iostreams/stream.hpp>
-
 #include <ball_log.h>
 #include <bdlb_bigendian.h>
 
@@ -209,7 +206,6 @@ void Framer::makeMethodFrame(rmqamqpt::Frame* frame,
                              uint16_t channel,
                              const rmqamqpt::Method& method)
 {
-    using namespace boost::iostreams;
 
     const size_t encodedPayloadSize = method.encodedSize();
     const size_t encodedFrameSize =
@@ -233,7 +229,6 @@ rmqamqpt::Frame Framer::makeContentBodyFrame(const uint8_t* message,
                                              const size_t encodedPayloadSize,
                                              uint16_t channel)
 {
-    using namespace boost::iostreams;
 
     bsl::shared_ptr<bsl::vector<uint8_t> > data =
         bsl::make_shared<bsl::vector<uint8_t> >();
@@ -251,7 +246,6 @@ rmqamqpt::Frame Framer::makeContentBodyFrame(const uint8_t* message,
 rmqamqpt::Frame Framer::makeContentHeaderFrame(const rmqt::Message& message,
                                                uint16_t channel)
 {
-    using namespace boost::iostreams;
 
     const rmqamqpt::ContentHeader header(rmqamqpt::Constants::BASIC, message);
 
@@ -274,7 +268,6 @@ rmqamqpt::Frame Framer::makeContentHeaderFrame(const rmqt::Message& message,
 
 rmqamqpt::Frame Framer::makeHeartbeatFrame()
 {
-    using namespace boost::iostreams;
 
     const bsl::shared_ptr<bsl::vector<uint8_t> > data =
         bsl::make_shared<bsl::vector<uint8_t> >();
diff --git a/src/rmq/rmqamqpt/rmqamqpt_method.cpp b/src/rmq/rmqamqpt/rmqamqpt_method.cpp
index cea97ec0..98802c89 100644
--- a/src/rmq/rmqamqpt/rmqamqpt_method.cpp
+++ b/src/rmq/rmqamqpt/rmqamqpt_method.cpp
@@ -17,8 +17,6 @@
 
 #include <rmqamqpt_types.h>
 
-#include <boost/iostreams/stream.hpp>
-
 #include <ball_log.h>
 #include <bdlb_bigendian.h>
 #include <bsl_cstdint.h>
diff --git a/src/tests/rmqamqp/rmqamqp_framer.t.cpp b/src/tests/rmqamqp/rmqamqp_framer.t.cpp
index d1a99afd..aaf305a9 100644
--- a/src/tests/rmqamqp/rmqamqp_framer.t.cpp
+++ b/src/tests/rmqamqp/rmqamqp_framer.t.cpp
@@ -21,9 +21,6 @@
 #include <rmqio_serializedframe.h>
 #include <rmqt_fieldvalue.h>
 
-#include <boost/iostreams/device/back_inserter.hpp>
-#include <boost/iostreams/stream.hpp>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -58,7 +55,6 @@ class ContentDecodeTests : public ::testing::Test {
                     uint16_t channel,
                     const rmqamqpt::ContentHeader& contentHeader)
     {
-        using namespace boost::iostreams;
 
         const size_t encodedPayloadSize = contentHeader.encodedSize();
 
@@ -83,7 +79,6 @@ class ContentDecodeTests : public ::testing::Test {
                                   uint16_t channel,
                                   const rmqamqpt::ContentBody& contentBody)
     {
-        using namespace boost::iostreams;
 
         const size_t encodedPayloadSize = contentBody.dataLength();
 
diff --git a/vcpkg.json b/vcpkg.json
index c4b2af7e..cbb159bc 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -4,7 +4,6 @@
     "version": "1.0.0",
     "dependencies": [
       "boost-asio",
-      "boost-iostreams",
       "openssl",
       "gtest",
       "bde"

From 78d84391ada811030c6c1056c3b6b126af998c02 Mon Sep 17 00:00:00 2001
From: Richard Oehlinger <richard@oehli.at>
Date: Thu, 18 Jul 2024 12:18:06 +0200
Subject: [PATCH 2/3] Cleanup unneeded OpenSSL include.

---
 src/rmq/rmqio/rmqio_asioconnection.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rmq/rmqio/rmqio_asioconnection.cpp b/src/rmq/rmqio/rmqio_asioconnection.cpp
index bdd0e978..fb5e20e3 100644
--- a/src/rmq/rmqio/rmqio_asioconnection.cpp
+++ b/src/rmq/rmqio/rmqio_asioconnection.cpp
@@ -20,7 +20,6 @@
 
 #include <boost/asio.hpp>
 #include <fcntl.h>
-#include <openssl/err.h>
 
 #include <ball_log.h>
 #include <bdlf_bind.h>

From 09e707ddc078c30b2e0a6a8bcbdc5c41a57d4deb Mon Sep 17 00:00:00 2001
From: Richard Oehlinger <richard@oehli.at>
Date: Thu, 18 Jul 2024 12:19:22 +0200
Subject: [PATCH 3/3] Added missing Boost dependency.

---
 src/rmq/rmqio/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rmq/rmqio/CMakeLists.txt b/src/rmq/rmqio/CMakeLists.txt
index 99005112..31716c40 100644
--- a/src/rmq/rmqio/CMakeLists.txt
+++ b/src/rmq/rmqio/CMakeLists.txt
@@ -29,6 +29,7 @@ target_link_libraries(rmqio PUBLIC
     bal
     rmqamqpt
     rmqt
+    Boost::boost
 )
 
 if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "SunPro" )