Reduce Boost header includes

Author: kylelutz

include/boost/compute/detail/get_object_info.hpp

@@ -14,6 +14,9 @@
 #include <string>
 #include <vector>
 
+#include <boost/preprocessor/seq/for_each.hpp>
+#include <boost/preprocessor/tuple/elem.hpp>
+
 #include <boost/throw_exception.hpp>
 
 #include <boost/compute/cl.hpp>

include/boost/compute/detail/parameter_cache.hpp

@@ -24,7 +24,7 @@
 #include <boost/compute/version.hpp>
 
 #ifdef BOOST_COMPUTE_USE_OFFLINE_CACHE
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <boost/compute/detail/path.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>

include/boost/compute/detail/path.hpp

@@ -11,7 +11,8 @@
 #ifndef BOOST_COMPUTE_DETAIL_PATH_HPP
 #define BOOST_COMPUTE_DETAIL_PATH_HPP
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/compute/detail/getenv.hpp>
 
 namespace boost {

include/boost/compute/device.hpp

@@ -11,11 +11,12 @@
 #ifndef BOOST_COMPUTE_DEVICE_HPP
 #define BOOST_COMPUTE_DEVICE_HPP
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
-#include <boost/range/algorithm.hpp>
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
 
 #include <boost/compute/config.hpp>
 #include <boost/compute/exception.hpp>
@@ -213,7 +214,8 @@ class device
     {
         const std::vector<std::string> extensions = this->extensions();
 
-        return boost::find(extensions, name) != extensions.end();
+        return std::find(
+            extensions.begin(), extensions.end(), name) != extensions.end();
     }
 
     /// Returns the number of address bits.

include/boost/compute/platform.hpp

@@ -11,11 +11,12 @@
 #ifndef BOOST_COMPUTE_PLATFORM_HPP
 #define BOOST_COMPUTE_PLATFORM_HPP
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
-#include <boost/range/algorithm.hpp>
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
 
 #include <boost/compute/cl.hpp>
 #include <boost/compute/device.hpp>
@@ -112,7 +113,8 @@ class platform
     {
         const std::vector<std::string> extensions = this->extensions();
 
-        return boost::find(extensions, name) != extensions.end();
+        return std::find(
+            extensions.begin(), extensions.end(), name) != extensions.end();
     }
 
     /// Returns a list of devices on the platform.

include/boost/compute/system.hpp

@@ -15,7 +15,6 @@
 #include <vector>
 #include <cstdlib>
 
-#include <boost/foreach.hpp>
 #include <boost/throw_exception.hpp>
 
 #include <boost/compute/cl.hpp>
@@ -85,7 +84,10 @@ class system
     /// \throws no_device_found if no device with \p name is found.
     static device find_device(const std::string &name)
     {
-        BOOST_FOREACH(const device &device, devices()){
+        const std::vector<device> devices = system::devices();
+        for(size_t i = 0; i < devices.size(); i++){
+            const device& device = devices[i];
+
             if(device.name() == name){
                 return device;
             }
@@ -108,10 +110,13 @@ class system
     {
         std::vector<device> devices;
 
-        BOOST_FOREACH(const platform &platform, platforms()){
-            BOOST_FOREACH(const device &device, platform.devices()){
-                devices.push_back(device);
-            }
+        const std::vector<platform> platforms = system::platforms();
+        for(size_t i = 0; i < platforms.size(); i++){
+            const std::vector<device> platform_devices = platforms[i].devices();
+
+            devices.insert(
+                devices.end(), platform_devices.begin(), platform_devices.end()
+            );
         }
 
         return devices;
@@ -122,8 +127,9 @@ class system
     {
         size_t count = 0;
 
-        BOOST_FOREACH(const platform &platform, platforms()){
-            count += platform.device_count();
+        const std::vector<platform> platforms = system::platforms();
+        for(size_t i = 0; i < platforms.size(); i++){
+            count += platforms[i].device_count();
         }
 
         return count;
@@ -214,7 +220,8 @@ class system
         const char *vendor   = detail::getenv("BOOST_COMPUTE_DEFAULT_VENDOR");
 
         if(name || type || platform || vendor){
-            BOOST_FOREACH(const device &device, devices_){
+            for(size_t i = 0; i < devices_.size(); i++){
+                const device& device = devices_[i];
                 if (name && !matches(device.name(), name))
                     continue;
 
@@ -237,14 +244,18 @@ class system
         }
 
         // find the first gpu device
-        BOOST_FOREACH(const device &device, devices_){
+        for(size_t i = 0; i < devices_.size(); i++){
+            const device& device = devices_[i];
+
             if(device.type() == device::gpu){
                 return device;
             }
         }
 
         // find the first cpu device
-        BOOST_FOREACH(const device &device, devices_){
+        for(size_t i = 0; i < devices_.size(); i++){
+            const device& device = devices_[i];
+
             if(device.type() == device::cpu){
                 return device;
             }

include/boost/compute/types/fundamental.hpp

@@ -14,7 +14,10 @@
 #include <cstring>
 #include <ostream>
 
-#include <boost/preprocessor.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/comma.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#include <boost/preprocessor/stringize.hpp>
 
 #include <boost/compute/cl.hpp>
 

include/boost/compute/types/tuple.hpp

@@ -14,6 +14,9 @@
 #include <string>
 #include <utility>
 
+#include <boost/preprocessor/enum.hpp>
+#include <boost/preprocessor/expr_if.hpp>
+#include <boost/preprocessor/repetition.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <boost/compute/config.hpp>
@@ -25,8 +28,6 @@
 #include <tuple>
 #endif
 
-#include <boost/preprocessor/repetition.hpp>
-
 namespace boost {
 namespace compute {
 namespace detail {