Remove some boost usage in favour of C++11 features

Author: bmerry

src/parameters.h

@@ -38,9 +38,8 @@
 #include <cstddef>
 #include <locale>
 #include <cassert>
+#include <type_traits>
 #include <boost/preprocessor.hpp>
-#include <boost/type_traits/is_integral.hpp>
-#include <boost/utility/enable_if.hpp>
 #include <clogs/visibility_pop.h>
 
 #include <clogs/core.h>
@@ -83,7 +82,7 @@ CLOGS_LOCAL int readFields(sqlite3_stmt *stmt, int pos, std::vector<unsigned cha
 
 /// @copydoc readFields(sqlite3_stmt *, int, std::string &)
 template<typename T>
-typename boost::enable_if<boost::is_integral<T>, int>::type
+typename std::enable_if<std::is_integral<T>::value, int>::type
 static inline readFields(sqlite3_stmt *stmt, int pos, T &value)
 {
     assert(pos >= 0 && pos < sqlite3_column_count(stmt));
@@ -130,7 +129,7 @@ static inline void fieldTypes(const std::vector<unsigned char> *, std::vector<co
 
 /// @copydoc fieldTypes(const std::string *, std::vector<const char *> &)
 template<typename T>
-static inline typename boost::enable_if<boost::is_integral<T> >::type
+static inline typename std::enable_if<std::is_integral<T>::value>::type
 fieldTypes(const T *, std::vector<const char *> &out)
 {
     out.push_back("INT");

test/clogs_test.cpp

@@ -30,7 +30,6 @@
 #include <cppunit/TestResult.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <boost/program_options.hpp>
-#include <boost/foreach.hpp>
 #include <string>
 #include <stdexcept>
 #include <typeinfo>

test/test_common.h

@@ -31,7 +31,7 @@
 #include <cstddef>
 #include <stdexcept>
 #include <utility>
-#include <boost/smart_ptr/scoped_ptr.hpp>
+#include <memory>
 #include <clogs/core.h>
 #include <clogs/platform.h>
 #include "clogs_test.h"
@@ -86,7 +86,7 @@ bool TestCommon<T>::initialized(const T &obj)
 template<typename T>
 void TestCommon<T>::testMoveConstruct()
 {
-    boost::scoped_ptr<T> s1((factory()));
+    std::unique_ptr<T> s1((factory()));
     T s2(std::move(*s1));
     CPPUNIT_ASSERT(initialized(s2));
     CPPUNIT_ASSERT(!initialized(*s1));
@@ -95,7 +95,7 @@ void TestCommon<T>::testMoveConstruct()
 template<typename T>
 void TestCommon<T>::testMoveAssign()
 {
-    boost::scoped_ptr<T> s1(factory());
+    std::unique_ptr<T> s1(factory());
     T s2;
     s2 = std::move(*s1);
     CPPUNIT_ASSERT(initialized(s2));
@@ -106,7 +106,7 @@ void TestCommon<T>::testMoveAssign()
 template<typename T>
 void TestCommon<T>::testSwap()
 {
-    boost::scoped_ptr<T> s1(factory());
+    std::unique_ptr<T> s1(factory());
     T s2;
     clogs::swap(*s1, s2);
     CPPUNIT_ASSERT(initialized(s2));

test/test_radixsort.cpp

@@ -29,7 +29,7 @@
 #include "../src/clhpp11.h"
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <iostream>
 #include <sstream>
 #include <stdexcept>
@@ -50,7 +50,7 @@ using namespace std;
  * Recompiling the program for every test is slow, so we cheat slightly by keeping
  * one sorting object around across all tests that use UINT key/value pairs.
  */
-static boost::scoped_ptr<clogs::detail::Radixsort> g_sort;
+static std::unique_ptr<clogs::detail::Radixsort> g_sort;
 
 class TestRadixsort : public clogs::Test::TestCommon<clogs::Radixsort>
 {
@@ -269,7 +269,7 @@ static inline T roundUp(T a, T b)
 void TestRadixsort::setUp()
 {
     clogs::Test::TestFixture::setUp();
-    if (g_sort == NULL)
+    if (!g_sort)
     {
         clogs::detail::RadixsortProblem problem;
         problem.setKeyType(clogs::TYPE_UINT);

tools/options.cpp

@@ -28,7 +28,6 @@
 
 #include "../src/clhpp11.h"
 #include <boost/program_options.hpp>
-#include <boost/foreach.hpp>
 #include <vector>
 #include "options.h"
 
@@ -49,13 +48,13 @@ std::vector<cl::Device> findDevices(const boost::program_options::variables_map
 
     vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
-    BOOST_FOREACH(const cl::Platform &platform, platforms)
+    for (const cl::Platform &platform : platforms)
     {
         vector<cl::Device> devices;
         cl_device_type type = CL_DEVICE_TYPE_ALL;
 
         platform.getDevices(type, &devices);
-        BOOST_FOREACH(const cl::Device &d, devices)
+        for (const cl::Device &d : devices)
         {
             bool good = true;
             /* Match name if given */

wscript

@@ -183,7 +183,7 @@ def configure(conf):
     if conf.options.cl_headers:
         conf.env.append_value('INCLUDES_OPENCL', [conf.options.cl_headers])
     conf.env.append_value('LIB_OPENCL', ['OpenCL'])
-    conf.check_cxx(header_name='boost/foreach.hpp')
+    conf.check_cxx(header_name='boost/any.hpp')
     conf.check_cxx(header_name='boost/program_options.hpp', use='PROGRAM_OPTIONS')
     conf.check_cxx(header_name='CL/cl.hpp', use='OPENCL')
     try:
@@ -205,7 +205,7 @@ def configure(conf):
         mandatory=False)
 
     # Don't care about the defines, just insist the headers are there
-    conf.undefine('HAVE_BOOST_FOREACH_HPP')
+    conf.undefine('HAVE_BOOST_ANY_HPP')
     conf.undefine('HAVE_BOOST_PROGRAM_OPTIONS_HPP')
     conf.undefine('HAVE_CL_CL_HPP')