From ac7bf465d290eb1196dde3e1d94d6b5ee313a02a Mon Sep 17 00:00:00 2001 From: gabsuren Date: Wed, 22 Jun 2022 17:55:10 +0400 Subject: [PATCH] asio: Disable concepts support Fix example for compatibility with C++20 * Original commit: espressif/esp-idf@9dba0476a01cd80d76e21706ad350009606b877e * Original commit: espressif/esp-idf@157247f98fcfe73dbb126b740206e8603eb6e002 --- components/asio/port/include/esp_asio_config.h | 1 + examples/protocols/asio/asio_chat/main/chat_message.hpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/asio/port/include/esp_asio_config.h b/components/asio/port/include/esp_asio_config.h index f8e34d617..cf42183a3 100644 --- a/components/asio/port/include/esp_asio_config.h +++ b/components/asio/port/include/esp_asio_config.h @@ -30,6 +30,7 @@ # define ASIO_SEPARATE_COMPILATION # define ASIO_STANDALONE # define ASIO_HAS_PTHREADS +# define ASIO_DISABLE_CONCEPTS # ifdef CONFIG_ASIO_USE_ESP_OPENSSL # define ASIO_USE_ESP_OPENSSL diff --git a/examples/protocols/asio/asio_chat/main/chat_message.hpp b/examples/protocols/asio/asio_chat/main/chat_message.hpp index 629105b05..a6ffc83b8 100644 --- a/examples/protocols/asio/asio_chat/main/chat_message.hpp +++ b/examples/protocols/asio/asio_chat/main/chat_message.hpp @@ -18,8 +18,8 @@ class chat_message { public: - enum { header_length = 4 }; - enum { max_body_length = 512 }; + static constexpr std::size_t header_length = 4; + static constexpr std::size_t max_body_length = 512; chat_message() : body_length_(0)