From eb96a578fde6a5718960683f58c6c4622a0d7654 Mon Sep 17 00:00:00 2001
From: Dennis Hezel <dh@3yourmind.com>
Date: Fri, 8 Apr 2022 15:53:00 +0200
Subject: [PATCH 1/5] style: Do not include Boost.Log related headers when
 MQTT_USE_LOG is disabled

---
 include/mqtt/log.hpp       | 12 ++++++++----
 include/mqtt/setup_log.hpp |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/include/mqtt/log.hpp b/include/mqtt/log.hpp
index 97f79340f..1e200198c 100644
--- a/include/mqtt/log.hpp
+++ b/include/mqtt/log.hpp
@@ -7,7 +7,11 @@
 #if !defined(MQTT_LOG_HPP)
 #define MQTT_LOG_HPP
 
-#include <tuple>
+#include <cstddef>
+#include <ostream>
+#include <string>
+
+#if defined(MQTT_USE_LOG)
 
 #include <boost/log/core.hpp>
 #include <boost/log/attributes.hpp>
@@ -24,12 +28,12 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/comparison/greater_equal.hpp>
 
+#endif
+
 #include <mqtt/namespace.hpp>
 
 namespace MQTT_NS {
 
-namespace log = boost::log;
-
 struct channel : std::string {
     using std::string::string;
 };
@@ -72,7 +76,7 @@ inline constexpr null_log const& operator<<(null_log const& o, T const&) { retur
 
 // template arguments are defined in MQTT_NS
 // filter and formatter can distinguish mqtt_cpp's channel and severity by their types
-using global_logger_t = log::sources::severity_channel_logger<severity_level, channel>;
+using global_logger_t = boost::log::sources::severity_channel_logger<severity_level, channel>;
 inline global_logger_t& logger() {
     thread_local global_logger_t l;
     return l;
diff --git a/include/mqtt/setup_log.hpp b/include/mqtt/setup_log.hpp
index c47e0a26e..c8106d306 100644
--- a/include/mqtt/setup_log.hpp
+++ b/include/mqtt/setup_log.hpp
@@ -15,12 +15,17 @@
 // setup_log() could be  a good reference for your own logging setup code.
 
 #include <mqtt/namespace.hpp>
+
+#if defined(MQTT_USE_LOG)
+
 #include <mqtt/log.hpp>
 #include <mqtt/move.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/date_time/posix_time/posix_time_io.hpp>
 
+#endif
+
 namespace MQTT_NS {
 
 #if defined(MQTT_USE_LOG)

From b00eb0b151501f5fde79e238a0bc88032f2ac495 Mon Sep 17 00:00:00 2001
From: Dennis Hezel <dh@3yourmind.com>
Date: Fri, 8 Apr 2022 16:53:25 +0200
Subject: [PATCH 2/5] doc: Add <iostream> header to examples that were missing
 it

---
 example/bench.cpp      | 1 +
 example/broker.cpp     | 2 ++
 example/client_cli.cpp | 1 +
 3 files changed, 4 insertions(+)

diff --git a/example/bench.cpp b/example/bench.cpp
index 2647b73a2..e063220ba 100644
--- a/example/bench.cpp
+++ b/example/bench.cpp
@@ -10,6 +10,7 @@
 
 #include <thread>
 #include <fstream>
+#include <iostream>
 
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
diff --git a/example/broker.cpp b/example/broker.cpp
index 8047cd943..317d18c0b 100644
--- a/example/broker.cpp
+++ b/example/broker.cpp
@@ -10,6 +10,8 @@
 #include <boost/format.hpp>
 
 #include <fstream>
+#include <iostream>
+#include <iomanip>
 #include <algorithm>
 
 namespace as = boost::asio;
diff --git a/example/client_cli.cpp b/example/client_cli.cpp
index 32d0835d1..5c299ee36 100644
--- a/example/client_cli.cpp
+++ b/example/client_cli.cpp
@@ -5,6 +5,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <iostream>
+#include <iomanip>
 
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>

From db70c46b6b3c31cdae352d37f797181c4b47bfa7 Mon Sep 17 00:00:00 2001
From: Dennis Hezel <dh@3yourmind.com>
Date: Fri, 8 Apr 2022 17:18:19 +0200
Subject: [PATCH 3/5] fix: Transitively include mqtt/log in mqtt/setup_log even
 when MQTT_USE_LOG is off. Also add missing include for <deque> in
 retained_topic_map

---
 include/mqtt/broker/retained_topic_map.hpp | 2 ++
 include/mqtt/setup_log.hpp                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/mqtt/broker/retained_topic_map.hpp b/include/mqtt/broker/retained_topic_map.hpp
index 980dec687..4472eed85 100644
--- a/include/mqtt/broker/retained_topic_map.hpp
+++ b/include/mqtt/broker/retained_topic_map.hpp
@@ -7,6 +7,8 @@
 #if !defined(MQTT_BROKER_RETAINED_TOPIC_MAP_HPP)
 #define MQTT_BROKER_RETAINED_TOPIC_MAP_HPP
 
+#include <deque>
+
 #include <boost/functional/hash.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
diff --git a/include/mqtt/setup_log.hpp b/include/mqtt/setup_log.hpp
index c8106d306..fce786509 100644
--- a/include/mqtt/setup_log.hpp
+++ b/include/mqtt/setup_log.hpp
@@ -15,10 +15,10 @@
 // setup_log() could be  a good reference for your own logging setup code.
 
 #include <mqtt/namespace.hpp>
+#include <mqtt/log.hpp>
 
 #if defined(MQTT_USE_LOG)
 
-#include <mqtt/log.hpp>
 #include <mqtt/move.hpp>
 
 #include <boost/filesystem.hpp>

From d59a4cab85aed0740c71393fda177a9b0bcc5ecf Mon Sep 17 00:00:00 2001
From: Dennis Hezel <dh@3yourmind.com>
Date: Fri, 8 Apr 2022 17:19:58 +0200
Subject: [PATCH 4/5] doc: Add missing <fstream> include to client_cli.cpp

---
 example/client_cli.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example/client_cli.cpp b/example/client_cli.cpp
index 5c299ee36..970c1d73f 100644
--- a/example/client_cli.cpp
+++ b/example/client_cli.cpp
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include <iomanip>
+#include <fstream>
 
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>

From 866d85005a6adc7b379d34fb7ffa3274fddf8a7d Mon Sep 17 00:00:00 2001
From: Dennis Hezel <dh@3yourmind.com>
Date: Sat, 9 Apr 2022 09:18:50 +0200
Subject: [PATCH 5/5] style: Add comments to #endif statements of MQTT_USE_LOG

---
 include/mqtt/log.hpp       | 2 +-
 include/mqtt/setup_log.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mqtt/log.hpp b/include/mqtt/log.hpp
index 1e200198c..fd460d59d 100644
--- a/include/mqtt/log.hpp
+++ b/include/mqtt/log.hpp
@@ -28,7 +28,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/comparison/greater_equal.hpp>
 
-#endif
+#endif // defined(MQTT_USE_LOG)
 
 #include <mqtt/namespace.hpp>
 
diff --git a/include/mqtt/setup_log.hpp b/include/mqtt/setup_log.hpp
index fce786509..2d3e8a038 100644
--- a/include/mqtt/setup_log.hpp
+++ b/include/mqtt/setup_log.hpp
@@ -24,7 +24,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/date_time/posix_time/posix_time_io.hpp>
 
-#endif
+#endif // defined(MQTT_USE_LOG)
 
 namespace MQTT_NS {