From 5e28138a7a2ed23ed721251131ee59c741820864 Mon Sep 17 00:00:00 2001 From: Jakub Szuppe Date: Tue, 3 May 2016 14:32:22 +0200 Subject: [PATCH 1/2] Update minimum required Boost version to 1.54 --- CMakeLists.txt | 2 +- example/CMakeLists.txt | 2 +- include/boost/compute/config.hpp | 4 ++-- perf/CMakeLists.txt | 2 +- test/CMakeLists.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f7aba3e..71e7722e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ find_package(OpenCL REQUIRED) include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS}) # find Boost -find_package(Boost 1.48 REQUIRED) +find_package(Boost 1.54 REQUIRED) include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) # optional support for c++11 diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 261271d5..a5708cb0 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -52,7 +52,7 @@ endif() if(EXAMPLE_BOOST_COMPONENTS) list(REMOVE_DUPLICATES EXAMPLE_BOOST_COMPONENTS) endif() -find_package(Boost 1.48 REQUIRED COMPONENTS ${EXAMPLE_BOOST_COMPONENTS}) +find_package(Boost 1.54 REQUIRED COMPONENTS ${EXAMPLE_BOOST_COMPONENTS}) include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) foreach(EXAMPLE ${EXAMPLES}) diff --git a/include/boost/compute/config.hpp b/include/boost/compute/config.hpp index 77d0d7b9..f4446858 100644 --- a/include/boost/compute/config.hpp +++ b/include/boost/compute/config.hpp @@ -16,8 +16,8 @@ #include // check for minimum required boost version -#if BOOST_VERSION < 104800 -#error Boost.Compute requires Boost version 1.48 or later +#if BOOST_VERSION < 105400 +#error Boost.Compute requires Boost version 1.54 or later #endif // the BOOST_COMPUTE_NO_VARIADIC_TEMPLATES macro is defined diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt index f2c55045..1690f65f 100644 --- a/perf/CMakeLists.txt +++ b/perf/CMakeLists.txt @@ -28,7 +28,7 @@ endif() if(PERF_BOOST_COMPONENTS) list(REMOVE_DUPLICATES PERF_BOOST_COMPONENTS) endif() -find_package(Boost 1.48 REQUIRED COMPONENTS ${PERF_BOOST_COMPONENTS}) +find_package(Boost 1.54 REQUIRED COMPONENTS ${PERF_BOOST_COMPONENTS}) include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) set(BENCHMARKS diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 362ed966..99e41c1d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -32,7 +32,7 @@ endif() if(BOOST_COMPONENTS) list(REMOVE_DUPLICATES BOOST_COMPONENTS) endif() -find_package(Boost 1.48 REQUIRED COMPONENTS ${BOOST_COMPONENTS}) +find_package(Boost 1.54 REQUIRED COMPONENTS ${BOOST_COMPONENTS}) if(NOT MSVC) add_definitions(-DBOOST_TEST_DYN_LINK) From 2fdafa2128d55e7cf524dea71f4af6523e4c8409 Mon Sep 17 00:00:00 2001 From: Jakub Szuppe Date: Tue, 3 May 2016 14:36:37 +0200 Subject: [PATCH 2/2] Remove deprecated Boost macros --- include/boost/compute/config.hpp | 10 +++------- include/boost/compute/kernel.hpp | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/boost/compute/config.hpp b/include/boost/compute/config.hpp index f4446858..e501ed28 100644 --- a/include/boost/compute/config.hpp +++ b/include/boost/compute/config.hpp @@ -23,7 +23,6 @@ // the BOOST_COMPUTE_NO_VARIADIC_TEMPLATES macro is defined // if the compiler does not *fully* support variadic templates #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || \ - defined(BOOST_NO_VARIADIC_TEMPLATES) || \ (defined(__GNUC__) && !defined(__clang__) && \ __GNUC__ == 4 && __GNUC_MINOR__ <= 6) #define BOOST_COMPUTE_NO_VARIADIC_TEMPLATES @@ -32,7 +31,6 @@ // the BOOST_COMPUTE_NO_STD_TUPLE macro is defined if the // compiler/stdlib does not support std::tuple #if defined(BOOST_NO_CXX11_HDR_TUPLE) || \ - defined(BOOST_NO_0X_HDR_TUPLE) || \ defined(BOOST_COMPUTE_NO_VARIADIC_TEMPLATES) #define BOOST_COMPUTE_NO_STD_TUPLE #endif // BOOST_NO_CXX11_HDR_TUPLE @@ -53,17 +51,15 @@ #endif #if !defined(BOOST_COMPUTE_DOXYGEN_INVOKED) && \ - (defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_NO_RVALUE_REFERENCES)) + defined(BOOST_NO_CXX11_RVALUE_REFERENCES) # define BOOST_COMPUTE_NO_RVALUE_REFERENCES #endif // BOOST_NO_CXX11_RVALUE_REFERENCES -#if defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) || \ - defined(BOOST_NO_0X_HDR_INITIALIZER_LIST) +#if defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) # define BOOST_COMPUTE_NO_HDR_INITIALIZER_LIST #endif // BOOST_NO_CXX11_HDR_INITIALIZER_LIST -#if defined(BOOST_NO_CXX11_HDR_CHRONO) || \ - defined(BOOST_NO_0X_HDR_CHRONO) +#if defined(BOOST_NO_CXX11_HDR_CHRONO) # define BOOST_COMPUTE_NO_HDR_CHRONO #endif // BOOST_NO_CXX11_HDR_CHRONO diff --git a/include/boost/compute/kernel.hpp b/include/boost/compute/kernel.hpp index 41f20494..2aa106b4 100644 --- a/include/boost/compute/kernel.hpp +++ b/include/boost/compute/kernel.hpp @@ -329,7 +329,7 @@ public: } private: - #ifndef BOOST_NO_VARIADIC_TEMPLATES + #ifndef BOOST_COMPUTE_NO_VARIADIC_TEMPLATES /// \internal_ template void _set_args() @@ -343,7 +343,7 @@ private: set_arg(N, arg); _set_args(rest...); } - #endif // BOOST_NO_VARIADIC_TEMPLATES + #endif // BOOST_COMPUTE_NO_VARIADIC_TEMPLATES private: cl_kernel m_kernel;