* Added BOOST_COMPUTE_USE_CPP11

* changed enum device_type name

Author: dvdjg

include/boost/compute/command_queue.hpp

@@ -1012,7 +1012,7 @@ class command_queue
     }
 
 
-#ifdef BOOST_NO_CXX11_LAMBDAS
+#if defined(BOOST_NO_CXX11_LAMBDAS) || !defined(BOOST_COMPUTE_USE_CPP11)
     // Resolve the lambda syntax sugar
     template<class Function>
     struct walk_image
@@ -1122,7 +1122,7 @@ class command_queue
 
         size_t element_size = image.get_image_info<size_t>(CL_IMAGE_ELEMENT_SIZE);
 
-#ifdef BOOST_NO_CXX11_LAMBDAS
+#if defined(BOOST_NO_CXX11_LAMBDAS) || !defined(BOOST_COMPUTE_USE_CPP11)
         walk_image<Function> func(walk_elemets, pImage3D, origin3.data(), region3.data(), row_pitch, slice_pitch, element_size, user_ev);
 #else
         auto func = [=]()

include/boost/compute/device.hpp

@@ -44,7 +44,7 @@ class platform;
 class device
 {
 public:
-    enum type {
+    enum device_type {
         default_type = CL_DEVICE_TYPE_DEFAULT,
         cpu = CL_DEVICE_TYPE_CPU,
         gpu = CL_DEVICE_TYPE_GPU,
@@ -161,7 +161,7 @@ class device
     }
 
     /// Returns the type of the device.
-    cl_device_type get_type() const
+    cl_device_type type() const
     {
         return get_info<cl_device_type>(CL_DEVICE_TYPE);
     }

include/boost/compute/system.hpp

@@ -88,14 +88,14 @@ class system
     /// \throws no_device_found if no device with \p name is found.
     static device find_device(const std::string &device_name = std::string(),
                               const std::string &platform_name = std::string(),
-                              device::type device_type = device::all,
+                              device::device_type device_type = device::all,
                               uint_ min_version = 100)
     {
         BOOST_FOREACH(const device &device, devices()){
             std::string platform_name_ = device.platform().name();
             if((platform_name.empty() || platform_name_.find(platform_name.c_str()) != std::string::npos)
               && (device_name.empty() || device.name().find(device_name.c_str()) != std::string::npos)
-              && (device.get_type() & device_type)
+              && (device.type() & device_type)
               && device.get_version() >= min_version){
                 return device;
             }
@@ -229,11 +229,11 @@ class system
                     continue;
 
                 if (type && matches(std::string("GPU"), type))
-                    if (device.get_type() != device::gpu)
+                    if (device.type() != device::gpu)
                         continue;
 
                 if (type && matches(std::string("CPU"), type))
-                    if (device.get_type() != device::cpu)
+                    if (device.type() != device::cpu)
                         continue;
 
                 if (platform && !matches(device.platform().name(), platform))
@@ -248,14 +248,14 @@ class system
 
         // find the first gpu device
         BOOST_FOREACH(const device &device, devices_){
-            if(device.get_type() == device::gpu){
+            if(device.type() == device::gpu){
                 return device;
             }
         }
 
         // find the first cpu device
         BOOST_FOREACH(const device &device, devices_){
-            if(device.get_type() == device::cpu){
+            if(device.type() == device::cpu){
                 return device;
             }
         }