Use C++17 standards and move from std::experimental::optional to std::optional

Author: vthiery

CMakeLists.txt

@@ -1,6 +1,8 @@
+project(StatsdClient)
 cmake_minimum_required(VERSION 3.2)
 
-project(StatsdClient)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/cpp-statsd-client)
 

include/cpp-statsd-client/StatsdClient.hpp

@@ -2,7 +2,7 @@
 #define STATSD_CLIENT_HPP
 
 #include <cstdlib>
-#include <experimental/optional>
+#include <optional>
 #include <string>
 #include "UDPSender.hpp"
 
@@ -25,39 +25,39 @@ class StatsdClient {
     //!@{
 
     //! Constructor
-    StatsdClient(const std::string &host,
+    StatsdClient(const std::string& host,
                  const uint16_t port,
-                 const std::string &prefix,
-                 const std::experimental::optional<uint64_t> batchsize = std::experimental::nullopt) noexcept;
+                 const std::string& prefix,
+                 const std::optional<uint64_t> batchsize = std::nullopt) noexcept;
 
     //!@}
 
     //!@name Methods
     //!@{
 
     //! Sets a configuration { host, port, prefix }
-    inline void setConfig(const std::string &host, const uint16_t port, const std::string &prefix) noexcept;
+    inline void setConfig(const std::string& host, const uint16_t port, const std::string& prefix) noexcept;
 
     //! Returns the error message as an optional std::string
-    inline std::experimental::optional<std::string> errorMessage() const noexcept;
+    inline std::optional<std::string> errorMessage() const noexcept;
 
     //! Increments the key, at a given frequency rate
-    inline void increment(const std::string &key, const float frequency = 1.0f) const noexcept;
+    inline void increment(const std::string& key, const float frequency = 1.0f) const noexcept;
 
     //! Increments the key, at a given frequency rate
-    inline void decrement(const std::string &key, const float frequency = 1.0f) const noexcept;
+    inline void decrement(const std::string& key, const float frequency = 1.0f) const noexcept;
 
     //! Adjusts the specified key by a given delta, at a given frequency rate
-    inline void count(const std::string &key, const int delta, const float frequency = 1.0f) const noexcept;
+    inline void count(const std::string& key, const int delta, const float frequency = 1.0f) const noexcept;
 
     //! Records a gauge for the key, with a given value, at a given frequency rate
-    inline void gauge(const std::string &key, const unsigned int value, const float frequency = 1.0f) const noexcept;
+    inline void gauge(const std::string& key, const unsigned int value, const float frequency = 1.0f) const noexcept;
 
     //! Records a timing for a key, at a given frequency
-    inline void timing(const std::string &key, const unsigned int ms, const float frequency = 1.0f) const noexcept;
+    inline void timing(const std::string& key, const unsigned int ms, const float frequency = 1.0f) const noexcept;
 
     //! Send a value for a key, according to its type, at a given frequency
-    void send(const std::string &key, const int value, const std::string &type, const float frequency = 1.0f) const
+    void send(const std::string& key, const int value, const std::string& type, const float frequency = 1.0f) const
         noexcept;
 
     //!@}
@@ -70,45 +70,45 @@ class StatsdClient {
     mutable UDPSender m_sender;
 };
 
-StatsdClient::StatsdClient(const std::string &host,
+StatsdClient::StatsdClient(const std::string& host,
                            const uint16_t port,
-                           const std::string &prefix,
-                           const std::experimental::optional<uint64_t> batchsize) noexcept
+                           const std::string& prefix,
+                           const std::optional<uint64_t> batchsize) noexcept
     : m_prefix(prefix), m_sender(host, port, batchsize) {
     // Initialize the randorm generator to be used for sampling
     std::srand(time(nullptr));
 }
 
-void StatsdClient::setConfig(const std::string &host, const uint16_t port, const std::string &prefix) noexcept {
+void StatsdClient::setConfig(const std::string& host, const uint16_t port, const std::string& prefix) noexcept {
     m_prefix = prefix;
     m_sender.setConfig(host, port);
 }
 
-std::experimental::optional<std::string> StatsdClient::errorMessage() const noexcept {
+std::optional<std::string> StatsdClient::errorMessage() const noexcept {
     return m_sender.errorMessage();
 }
 
-void StatsdClient::decrement(const std::string &key, const float frequency) const noexcept {
+void StatsdClient::decrement(const std::string& key, const float frequency) const noexcept {
     return count(key, -1, frequency);
 }
 
-void StatsdClient::increment(const std::string &key, const float frequency) const noexcept {
+void StatsdClient::increment(const std::string& key, const float frequency) const noexcept {
     return count(key, 1, frequency);
 }
 
-void StatsdClient::count(const std::string &key, const int delta, const float frequency) const noexcept {
+void StatsdClient::count(const std::string& key, const int delta, const float frequency) const noexcept {
     return send(key, delta, "c", frequency);
 }
 
-void StatsdClient::gauge(const std::string &key, const unsigned int value, const float frequency) const noexcept {
+void StatsdClient::gauge(const std::string& key, const unsigned int value, const float frequency) const noexcept {
     return send(key, value, "g", frequency);
 }
 
-void StatsdClient::timing(const std::string &key, const unsigned int ms, const float frequency) const noexcept {
+void StatsdClient::timing(const std::string& key, const unsigned int ms, const float frequency) const noexcept {
     return send(key, ms, "ms", frequency);
 }
 
-void StatsdClient::send(const std::string &key, const int value, const std::string &type, const float frequency) const
+void StatsdClient::send(const std::string& key, const int value, const std::string& type, const float frequency) const
     noexcept {
     const auto isFrequencyOne = [](const float frequency) noexcept {
         constexpr float epsilon{0.0001f};

include/cpp-statsd-client/UDPSender.hpp

@@ -9,8 +9,8 @@
 #include <cmath>
 #include <cstring>
 #include <deque>
-#include <experimental/optional>
 #include <mutex>
+#include <optional>
 #include <string>
 #include <thread>
 
@@ -30,9 +30,9 @@ class UDPSender final {
     //!@{
 
     //! Constructor
-    UDPSender(const std::string &host,
+    UDPSender(const std::string& host,
               const uint16_t port,
-              const std::experimental::optional<uint64_t> batchsize = std::experimental::nullopt) noexcept;
+              const std::optional<uint64_t> batchsize = std::nullopt) noexcept;
 
     //! Destructor
     ~UDPSender();
@@ -43,13 +43,13 @@ class UDPSender final {
     //!@{
 
     //! Sets a configuration { host, port }
-    inline void setConfig(const std::string &host, const uint16_t port) noexcept;
+    inline void setConfig(const std::string& host, const uint16_t port) noexcept;
 
     //! Send a message
-    void send(const std::string &message) noexcept;
+    void send(const std::string& message) noexcept;
 
     //! Returns the error message as an optional string
-    inline std::experimental::optional<std::string> errorMessage() const noexcept;
+    inline std::optional<std::string> errorMessage() const noexcept;
 
     //!@}
 
@@ -61,7 +61,7 @@ class UDPSender final {
     bool initialize() noexcept;
 
     //! Send a message to the daemon
-    void sendToDaemon(const std::string &message) noexcept;
+    void sendToDaemon(const std::string& message) noexcept;
 
     //!@}
 
@@ -115,12 +115,10 @@ class UDPSender final {
     //!@}
 
     //! Error message (optional string)
-    std::experimental::optional<std::string> m_errorMessage;
+    std::optional<std::string> m_errorMessage;
 };
 
-UDPSender::UDPSender(const std::string &host,
-                     const uint16_t port,
-                     const std::experimental::optional<uint64_t> batchsize) noexcept
+UDPSender::UDPSender(const std::string& host, const uint16_t port, const std::optional<uint64_t> batchsize) noexcept
     : m_host(host), m_port(port) {
     // If batching is on, use a dedicated thread to send every now and then
     if (batchsize) {
@@ -165,7 +163,7 @@ UDPSender::~UDPSender() {
     }
 }
 
-void UDPSender::setConfig(const std::string &host, const uint16_t port) noexcept {
+void UDPSender::setConfig(const std::string& host, const uint16_t port) noexcept {
     m_host = host;
     m_port = port;
 
@@ -177,7 +175,7 @@ void UDPSender::setConfig(const std::string &host, const uint16_t port) noexcept
     m_socket = -1;
 }
 
-void UDPSender::send(const std::string &message) noexcept {
+void UDPSender::send(const std::string& message) noexcept {
     // If batching is on, accumulate messages in the queue
     if (m_batching) {
         std::unique_lock<std::mutex> batchingLock(m_batchingMutex);
@@ -191,7 +189,7 @@ void UDPSender::send(const std::string &message) noexcept {
     }
 }
 
-std::experimental::optional<std::string> UDPSender::errorMessage() const noexcept {
+std::optional<std::string> UDPSender::errorMessage() const noexcept {
     return m_errorMessage;
 }
 
@@ -245,7 +243,7 @@ bool UDPSender::initialize() noexcept {
     return true;
 }
 
-void UDPSender::sendToDaemon(const std::string &message) noexcept {
+void UDPSender::sendToDaemon(const std::string& message) noexcept {
     // Can't send until the sender is initialized
     if (!initialize()) {
         return;