From: Matan Breizman <mbreizma@redhat.com>
Date: Tue, 4 Feb 2025 15:54:21 +0000 (+0000)
Subject: crimson/CMakeLists: cleanup BOOST_ASIO_DISABLE_CONCEPTS
X-Git-Tag: v20.3.0~427^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8679652cced14ce840de29fbd6cef2cb639f6160;p=ceph.git

crimson/CMakeLists: cleanup BOOST_ASIO_DISABLE_CONCEPTS

This was used to fix issue (https://github.com/boostorg/asio/issues/312)
with gcc10 and clang.
Should not be relevant anymore as we require for gcc13
(and clang 16 in the future).

Partially reverts: b556e42e20b13f76a6878b5bd2ade19b886d16e9

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
index 6bbd7b49ec7..b8f620c3036 100644
--- a/src/crimson/CMakeLists.txt
+++ b/src/crimson/CMakeLists.txt
@@ -1,11 +1,6 @@
 add_library(crimson::cflags INTERFACE IMPORTED)
 set(crimson_cflag_definitions "WITH_SEASTAR=1")
-# disable concepts to address https://github.com/boostorg/asio/issues/312
-if((CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10) OR
-   (CMAKE_CXX_COMPILER_ID STREQUAL Clang))
- list(APPEND crimson_cflag_definitions
-   "BOOST_ASIO_DISABLE_CONCEPTS")
-endif()
+
 set_target_properties(crimson::cflags PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "${crimson_cflag_definitions}"
   INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:-Wno-non-virtual-dtor>