Replaced boost with cpp17 things in sources + removed undef max because it was useless actually.

Author: TheSharpOwl

include/cppkafka/configuration.h

@@ -35,7 +35,7 @@
 #include <functional>
 #include <initializer_list>
 #include <chrono>
-#include <boost/optional.hpp>
+#include <optional>
 #include <librdkafka/rdkafka.h>
 #include "topic_partition_list.h"
 #include "topic_configuration.h"
@@ -226,12 +226,12 @@ class CPPKAFKA_API Configuration : public ConfigurationBase<Configuration> {
     /**
      * Gets the default topic configuration
      */
-    const boost::optional<TopicConfiguration>& get_default_topic_configuration() const;
+    const std::optional<TopicConfiguration>& get_default_topic_configuration() const;
 
     /**
      * Gets the default topic configuration
      */
-    boost::optional<TopicConfiguration>& get_default_topic_configuration();
+    std::optional<TopicConfiguration>& get_default_topic_configuration();
 private:
     using HandlePtr = ClonablePtr<rd_kafka_conf_t, decltype(&rd_kafka_conf_destroy),
                                   decltype(&rd_kafka_conf_dup)>;
@@ -240,7 +240,7 @@ class CPPKAFKA_API Configuration : public ConfigurationBase<Configuration> {
     static HandlePtr make_handle(rd_kafka_conf_t* ptr);
 
     HandlePtr handle_;
-    boost::optional<TopicConfiguration> default_topic_config_;
+    std::optional<TopicConfiguration> default_topic_config_;
     DeliveryReportCallback delivery_report_callback_;
     OffsetCommitCallback offset_commit_callback_;
     ErrorCallback error_callback_;

include/cppkafka/message.h

@@ -34,7 +34,7 @@
 #include <cstdint>
 #include <chrono>
 #include <cassert>
-#include <boost/optional.hpp>
+#include <optional>
 #include <librdkafka/rdkafka.h>
 #include "buffer.h"
 #include "macros.h"
@@ -189,7 +189,7 @@ class CPPKAFKA_API Message {
      *
      * If calling rd_kafka_message_timestamp returns -1, then boost::none_t will be returned.
      */
-    boost::optional<MessageTimestamp> get_timestamp() const;
+    std::optional<MessageTimestamp> get_timestamp() const;
 
 #if RD_KAFKA_VERSION >= RD_KAFKA_MESSAGE_LATENCY_SUPPORT_VERSION
     /**

include/cppkafka/utils/compacted_topic_processor.h

@@ -34,7 +34,7 @@
 #include <string>
 #include <map>
 #include <set>
-#include <boost/optional.hpp>
+#include<optional>
 #include "../buffer.h"
 #include "../consumer.h"
 #include "../macros.h"
@@ -106,8 +106,8 @@ class CPPKAFKA_API CompactedTopicEvent {
     EventType type_;
     std::string topic_;
     int partition_;
-    boost::optional<Key> key_;
-    boost::optional<Value> value_;
+    std::optional<Key> key_;
+    std::optional<Value> value_;
 };
 
 template <typename Key, typename Value>
@@ -121,12 +121,12 @@ class CPPKAFKA_API CompactedTopicProcessor {
     /**
      * Callback used for decoding key objects
      */
-    using KeyDecoder = std::function<boost::optional<Key>(const Buffer&)>;
+    using KeyDecoder = std::function<std::optional<Key>(const Buffer&)>;
 
     /**
      * Callback used for decoding value objects
      */
-    using ValueDecoder = std::function<boost::optional<Value>(const Key& key, const Buffer&)>;
+    using ValueDecoder = std::function<std::optional<Value>(const Key& key, const Buffer&)>;
 
     /**
      * Callback used for event handling
@@ -276,10 +276,10 @@ void CompactedTopicProcessor<Key, Value>::process_event() {
     Message message = consumer_.poll();
     if (message) {
         if (!message.get_error()) {
-            boost::optional<Key> key = key_decoder_(message.get_key());
+            std::optional<Key> key = key_decoder_(message.get_key());
             if (key) {
                 if (message.get_payload()) {
-                    boost::optional<Value> value = value_decoder_(*key, message.get_payload());
+                    std::optional<Value> value = value_decoder_(*key, message.get_payload());
                     if (value) {
                         // If there's a payload and we managed to parse the value, generate a
                         // SET_ELEMENT event

include/cppkafka/utils/poll_strategy_base.h

@@ -31,7 +31,7 @@
 #define CPPKAFKA_POLL_STRATEGY_BASE_H
 
 #include <map>
-#include <boost/any.hpp>
+#include <any>
 #include "../queue.h"
 #include "../topic_partition_list.h"
 #include "poll_interface.h"
@@ -45,7 +45,7 @@ namespace cppkafka {
  */
 struct QueueData {
     Queue       queue;
-    boost::any  metadata;
+    std::any  metadata;
 };
 
 /**

src/configuration.cpp

@@ -41,7 +41,7 @@ using std::move;
 using std::vector;
 using std::initializer_list;
 using std::chrono::milliseconds;
-using boost::optional;
+using std::optional;
 
 namespace cppkafka {
 

src/message.cpp

@@ -84,7 +84,7 @@ Message& Message::load_internal() {
     return *this;
 }
 
-boost::optional<MessageTimestamp> Message::get_timestamp() const {
+std::optional<MessageTimestamp> Message::get_timestamp() const {
     rd_kafka_timestamp_type_t type = RD_KAFKA_TIMESTAMP_NOT_AVAILABLE;
     int64_t timestamp = rd_kafka_message_timestamp(handle_.get(), &type);
     if (timestamp == -1 || type == RD_KAFKA_TIMESTAMP_NOT_AVAILABLE) {

src/producer.cpp

@@ -143,7 +143,7 @@ void Producer::do_produce(const Message& message,
     const Buffer& payload = message.get_payload();
     const Buffer& key = message.get_key();
     const int policy = static_cast<int>(message_payload_policy_);
-    int64_t duration = message.get_timestamp() ? message.get_timestamp().get().get_timestamp().count() : 0;
+    int64_t duration = message.get_timestamp() ? message.get_timestamp().value().get_timestamp().count() : 0;
     auto result = rd_kafka_producev(get_handle(),
                                     RD_KAFKA_V_TOPIC(message.get_topic().data()),
                                     RD_KAFKA_V_PARTITION(message.get_partition()),

src/utils/backoff_performer.cpp

@@ -26,10 +26,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#include "utils/backoff_performer.h"
-#undef max // solves the windows issue which prevents using std::numeric_limits<T>::max()
 #include <limits>
 #include <algorithm>
+#include "utils/backoff_performer.h"
 
 using std::min;
 using std::numeric_limits;

src/utils/poll_strategy_base.cpp

@@ -36,7 +36,7 @@ namespace cppkafka {
 
 PollStrategyBase::PollStrategyBase(Consumer& consumer)
 : consumer_(consumer),
-  consumer_queue_(QueueData{consumer.get_consumer_queue(), boost::any()}) {
+  consumer_queue_(QueueData{consumer.get_consumer_queue(), std::any()}) {
     // get all currently active partition assignments
     TopicPartitionList assignment = consumer_.get_assignment();
     on_assignment(assignment);
@@ -93,7 +93,7 @@ void PollStrategyBase::assign(TopicPartitionList& partitions) {
     // populate partition queues
     for (const auto& partition : partitions) {
         // get the queue associated with this partition
-        partition_queues_.emplace(partition, QueueData{consumer_.get_partition_queue(partition), boost::any()});
+        partition_queues_.emplace(partition, QueueData{consumer_.get_partition_queue(partition), std::any()});
     }
     reset_state();
 }