Merge pull request #608 from haahh/pr_remove_deprecated_macros

Remove deprecated macros

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

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})

include/boost/compute/config.hpp

@@ -16,14 +16,13 @@
 #include <boost/compute/cl.hpp>
 
 // 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
 // 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
 

include/boost/compute/kernel.hpp

@@ -329,7 +329,7 @@ public:
     }
 
 private:
-    #ifndef BOOST_NO_VARIADIC_TEMPLATES
+    #ifndef BOOST_COMPUTE_NO_VARIADIC_TEMPLATES
     /// \internal_
     template<size_t N>
     void _set_args()
@@ -343,7 +343,7 @@ private:
         set_arg(N, arg);
         _set_args<N+1>(rest...);
     }
-    #endif // BOOST_NO_VARIADIC_TEMPLATES
+    #endif // BOOST_COMPUTE_NO_VARIADIC_TEMPLATES
 
 private:
     cl_kernel m_kernel;

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

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)