From 794e03af308cf714f3852a496bb741b188c55a23 Mon Sep 17 00:00:00 2001
From: Andrzej Krzemienski <akrzemi1@gmail.com>
Date: Thu, 15 Aug 2024 10:43:43 +0200
Subject: [PATCH] Drop dependency on Boost.Predef

---
 CMakeLists.txt                                           | 2 --
 doc/90_dependencies.qbk                                  | 1 -
 doc/91_relnotes.qbk                                      | 1 +
 include/boost/optional/detail/experimental_traits.hpp    | 1 -
 test/optional_xconfig_HACK_TO_LIST_PREDEFINED_MACROS.cpp | 6 +++---
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aba836f..0d5a858 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,11 +18,9 @@ target_link_libraries(boost_optional
     Boost::config
     Boost::core
     Boost::move
-    Boost::predef
     Boost::static_assert
     Boost::throw_exception
     Boost::type_traits
-    Boost::utility
 )
 
 if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
diff --git a/doc/90_dependencies.qbk b/doc/90_dependencies.qbk
index d033b08..e0beee3 100644
--- a/doc/90_dependencies.qbk
+++ b/doc/90_dependencies.qbk
@@ -18,7 +18,6 @@ The implementation uses the following other Boost modules:
 # config
 # core
 # move
-# predef
 # static_assert
 # throw_exception
 # type_traits
diff --git a/doc/91_relnotes.qbk b/doc/91_relnotes.qbk
index 9307a24..8b1a9e8 100644
--- a/doc/91_relnotes.qbk
+++ b/doc/91_relnotes.qbk
@@ -15,6 +15,7 @@
 
 * *Breaking change.* Dropped support for C++03. C++11 is now the required minimum.
 * Dropped dependency on Boost.Utility.
+* Dropped dependency on Boost.Predef.
 * A bit faster implementation of some relational operations.
 
 
diff --git a/include/boost/optional/detail/experimental_traits.hpp b/include/boost/optional/detail/experimental_traits.hpp
index 5667034..24df623 100644
--- a/include/boost/optional/detail/experimental_traits.hpp
+++ b/include/boost/optional/detail/experimental_traits.hpp
@@ -14,7 +14,6 @@
 
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
-#include <boost/predef.h>
 #include <boost/type_traits.hpp>
 
 // The condition to use POD implementation
diff --git a/test/optional_xconfig_HACK_TO_LIST_PREDEFINED_MACROS.cpp b/test/optional_xconfig_HACK_TO_LIST_PREDEFINED_MACROS.cpp
index 202c7ef..a3e7a68 100644
--- a/test/optional_xconfig_HACK_TO_LIST_PREDEFINED_MACROS.cpp
+++ b/test/optional_xconfig_HACK_TO_LIST_PREDEFINED_MACROS.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/core/lightweight_test.hpp"
 #include "boost/optional/detail/optional_config.hpp"
-#include "boost/predef.h"
+//#include "boost/predef.h"
 #include <string>
 
 int main()
@@ -19,13 +19,13 @@ int main()
 #if defined(__GNUC__)
 
   std::string emptys;
-  
+
 #ifdef BOOST_INTEL_CXX_VERSION
   BOOST_TEST_EQ(emptys, "HAS INTEL INSIDE");
 #else
   BOOST_TEST_EQ(emptys, "NO INTEL INSIDE");
 #endif
-  
+
 #if !defined BOOST_NO_CXX11_RVALUE_REFERENCES
   BOOST_TEST_EQ(emptys, "HAS RVALUE REFS");
 #else