From 7e9f019a497d94fe38b51d281cf173d366d99d86 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Fri, 9 Jun 2017 11:31:22 +0900 Subject: [PATCH] Remove optional dependencies on Boost. Standard smart pointers are now common among the latest compilers. --- ConfigureChecks.cmake | 12 ------------ config.h.cmake | 1 - taglib/toolkit/tsmartptr.h | 9 +-------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index f5825c3f..0938d1d0 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -122,18 +122,6 @@ check_cxx_source_compiles(" } " HAVE_STD_SMART_PTR) -if(NOT HAVE_STD_SMART_PTR) - check_cxx_source_compiles(" - #include - #include - int main() { - boost::shared_ptr x; - boost::scoped_ptr y; - return 0; - } - " HAVE_BOOST_SMART_PTR) -endif() - # Determine which kind of byte swap functions your compiler supports. check_cxx_source_compiles(" diff --git a/config.h.cmake b/config.h.cmake index 56b0ec4e..c1d4002b 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -24,7 +24,6 @@ /* Defined if your compiler supports shared_ptr */ #cmakedefine HAVE_STD_SMART_PTR 1 -#cmakedefine HAVE_BOOST_SMART_PTR 1 /* Defined if your compiler supports some safer version of vsprintf */ #cmakedefine HAVE_VSNPRINTF 1 diff --git a/taglib/toolkit/tsmartptr.h b/taglib/toolkit/tsmartptr.h index 6cd20f3b..cf1bac4b 100644 --- a/taglib/toolkit/tsmartptr.h +++ b/taglib/toolkit/tsmartptr.h @@ -43,14 +43,7 @@ # define SHARED_PTR std::shared_ptr # define SCOPED_PTR std::unique_ptr -#elif defined(HAVE_BOOST_SMART_PTR) - -# include -# include -# define SHARED_PTR boost::shared_ptr -# define SCOPED_PTR boost::scoped_ptr - -#else // !HAVE_STD_SMART_PTR && !HAVE_BOOST_SMART_PTR +#else // !HAVE_STD_SMART_PTR # include # include