Refine MACRO for c++17 support

Author: kenneth-jia

include/kafka/AdminClient.h

@@ -96,7 +96,7 @@ class AdminClient: public KafkaClient
     static std::list<SimpleError> getPerTopicPartitionResults(const rd_kafka_topic_partition_list_t* partitionResults);
     static SimpleError combineErrors(const std::list<SimpleError>& errors);
 
-#if __cplusplus >= 201703L
+#if COMPILER_SUPPORTS_CPP_17
     static constexpr int DEFAULT_COMMAND_TIMEOUT_MS = 30000;
     static constexpr int EVENT_POLLING_INTERVAL_MS  = 100;
 #else

include/kafka/Consumer.h

@@ -28,7 +28,7 @@ namespace Consumer
     /**
      * Null RebalanceCallback
      */
-#if __cplusplus >= 201703L
+#if COMPILER_SUPPORTS_CPP_17
     const inline RebalanceCallback NullRebalanceCallback = RebalanceCallback{};
 #else
     const static RebalanceCallback NullRebalanceCallback = RebalanceCallback{};
@@ -42,7 +42,7 @@ namespace Consumer
     /**
      * Null OffsetCommitCallback
      */
-#if __cplusplus >= 201703L
+#if COMPILER_SUPPORTS_CPP_17
     const inline OffsetCommitCallback NullOffsetCommitCallback = OffsetCommitCallback{};
 #else
     const static OffsetCommitCallback NullOffsetCommitCallback = OffsetCommitCallback{};

include/kafka/Header.h

@@ -42,7 +42,7 @@ using Headers = std::vector<Header>;
 /**
  * Null Headers.
  */
-#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) 
+#if COMPILER_SUPPORTS_CPP_17
 const inline Headers NullHeaders = Headers{};
 #else
 const static Headers NullHeaders = Headers{};

include/kafka/KafkaClient.h

@@ -200,7 +200,7 @@ class KafkaClient
     static const constexpr char* SECURITY_PROTOCOL          = "security.protocol";
     static const constexpr char* SASL_KERBEROS_SERVICE_NAME = "sasl.kerberos.service.name";
 
-#if __cplusplus >= 201703L
+#if COMPILER_SUPPORTS_CPP_17
     static constexpr int DEFAULT_METADATA_TIMEOUT_MS = 10000;
 #else
     enum { DEFAULT_METADATA_TIMEOUT_MS = 10000 };

include/kafka/KafkaConsumer.h

@@ -225,7 +225,7 @@ class KafkaConsumer: public KafkaClient
     static const constexpr char* ENABLE_AUTO_COMMIT       = "enable.auto.commit";
     static const constexpr char* AUTO_COMMIT_INTERVAL_MS  = "auto.commit.interval.ms";
 
-#if __cplusplus >= 201703L
+#if COMPILER_SUPPORTS_CPP_17
     static constexpr int DEFAULT_SUBSCRIBE_TIMEOUT_MS   = 30000;
     static constexpr int DEFAULT_UNSUBSCRIBE_TIMEOUT_MS = 10000;
     static constexpr int DEFAULT_QUERY_TIMEOUT_MS       = 10000;

include/kafka/KafkaProducer.h

@@ -100,7 +100,7 @@ class KafkaProducer: public KafkaClient
 
     static constexpr int CALLBACK_POLLING_INTERVAL_MS = 10;
 
-#if __cplusplus >= 201703L
+#if COMPILER_SUPPORTS_CPP_17
     static constexpr int DEFAULT_INIT_TRANSACTIONS_TIMEOUT_MS  = 10000;
     static constexpr int DEFAULT_COMMIT_TRANSACTION_TIMEOUT_MS = 10000;
 #else

include/kafka/Project.h

@@ -12,4 +12,8 @@
 
 #if defined(WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
+
+#define COMPILER_SUPPORTS_CPP_17 ((__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L))
+
 #endif
+

include/kafka/Types.h

@@ -16,7 +16,7 @@
 
 
 // Use `boost::optional` for C++14, which doesn't support `std::optional`
-#if  (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) 
+#if COMPILER_SUPPORTS_CPP_17
 #include <optional>
 template<class T>
 using Optional = std::optional<T>;
@@ -84,7 +84,7 @@ using KeySize   = std::size_t;
 /**
  * Null Key.
  */
-#if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) 
+#if COMPILER_SUPPORTS_CPP_17
 const inline Key NullKey = Key{};
 #else
 const static Key NullKey = Key{};
@@ -99,7 +99,7 @@ using ValueSize = std::size_t;
 /**
  * Null Value.
  */
-#if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) 
+#if COMPILER_SUPPORTS_CPP_17
 const inline Value NullValue = Value{};
 #else
 const static Value NullValue = Value{};