diff --git a/include/boost/compute/algorithm/detail/inplace_reduce.hpp b/include/boost/compute/algorithm/detail/inplace_reduce.hpp
index 4fb4f261..e9637644 100644
--- a/include/boost/compute/algorithm/detail/inplace_reduce.hpp
+++ b/include/boost/compute/algorithm/detail/inplace_reduce.hpp
@@ -33,7 +33,7 @@ inline void inplace_reduce(Iterator first,
         std::iterator_traits<Iterator>::value_type
         value_type;
     typedef typename
-        boost::result_of<BinaryFunction(value_type, value_type)>::type
+        boost::tr1_result_of<BinaryFunction(value_type, value_type)>::type
         result_type;
 
     size_t input_size = iterator_range_size(first, last);
diff --git a/include/boost/compute/algorithm/reduce.hpp b/include/boost/compute/algorithm/reduce.hpp
index 074cb1eb..c2f7e449 100644
--- a/include/boost/compute/algorithm/reduce.hpp
+++ b/include/boost/compute/algorithm/reduce.hpp
@@ -41,7 +41,7 @@ size_t reduce(InputIterator first,
         std::iterator_traits<InputIterator>::value_type
         input_type;
     typedef typename
-        boost::result_of<BinaryFunction(input_type, input_type)>::type
+        boost::tr1_result_of<BinaryFunction(input_type, input_type)>::type
         result_type;
 
     const context &context = queue.get_context();
@@ -120,7 +120,7 @@ size_t reduce(InputIterator first,
 
 template<class InputIterator, class BinaryFunction>
 inline vector<
-    typename boost::result_of<
+    typename boost::tr1_result_of<
         BinaryFunction(
             typename std::iterator_traits<InputIterator>::value_type,
             typename std::iterator_traits<InputIterator>::value_type
@@ -137,7 +137,7 @@ block_reduce(InputIterator first,
         std::iterator_traits<InputIterator>::value_type
         input_type;
     typedef typename
-        boost::result_of<BinaryFunction(input_type, input_type)>::type
+        boost::tr1_result_of<BinaryFunction(input_type, input_type)>::type
         result_type;
 
     const context &context = queue.get_context();
@@ -163,7 +163,7 @@ inline T reduce(InputIterator first,
         std::iterator_traits<InputIterator>::value_type
         input_type;
     typedef typename
-        boost::result_of<BinaryFunction(input_type, input_type)>::type
+        boost::tr1_result_of<BinaryFunction(input_type, input_type)>::type
         result_type;
 
     size_t count = detail::iterator_range_size(first, last);
diff --git a/include/boost/compute/iterator/adjacent_transform_iterator.hpp b/include/boost/compute/iterator/adjacent_transform_iterator.hpp
index 2c4b487a..25ce4b41 100644
--- a/include/boost/compute/iterator/adjacent_transform_iterator.hpp
+++ b/include/boost/compute/iterator/adjacent_transform_iterator.hpp
@@ -39,7 +39,9 @@ struct make_adjacent_transform_iterator_value_type
 {
     typedef typename std::iterator_traits<InputIterator>::value_type value_type;
 
-    typedef typename boost::result_of<BinaryFunction(value_type, value_type)>::type type;
+    typedef typename
+        boost::tr1_result_of<BinaryFunction(value_type, value_type)>::type
+        type;
 };
 
 // helper class which defines the iterator_adaptor super-class
diff --git a/include/boost/compute/iterator/binary_transform_iterator.hpp b/include/boost/compute/iterator/binary_transform_iterator.hpp
index 7f10a1d9..c5827ce0 100644
--- a/include/boost/compute/iterator/binary_transform_iterator.hpp
+++ b/include/boost/compute/iterator/binary_transform_iterator.hpp
@@ -40,7 +40,9 @@ struct make_binary_transform_iterator_value_type
     typedef typename std::iterator_traits<InputIterator1>::value_type value_type1;
     typedef typename std::iterator_traits<InputIterator2>::value_type value_type2;
 
-    typedef typename boost::result_of<BinaryFunction(value_type1, value_type2)>::type type;
+    typedef typename
+        boost::tr1_result_of<BinaryFunction(value_type1, value_type2)>::type
+        type;
 };
 
 // helper class which defines the iterator_facade super-class
diff --git a/include/boost/compute/iterator/function_input_iterator.hpp b/include/boost/compute/iterator/function_input_iterator.hpp
index a005aa43..f7e24582 100644
--- a/include/boost/compute/iterator/function_input_iterator.hpp
+++ b/include/boost/compute/iterator/function_input_iterator.hpp
@@ -37,16 +37,16 @@ class function_input_iterator_base
 public:
     typedef ::boost::iterator_facade<
         ::boost::compute::function_input_iterator<Function>,
-        typename ::boost::result_of<Function()>::type,
+        typename ::boost::tr1_result_of<Function()>::type,
         ::std::random_access_iterator_tag,
-        typename ::boost::result_of<Function()>::type
+        typename ::boost::tr1_result_of<Function()>::type
     > type;
 };
 
 template<class Function>
 struct function_input_iterator_expr
 {
-    typedef typename ::boost::result_of<Function()>::type result_type;
+    typedef typename ::boost::tr1_result_of<Function()>::type result_type;
 
     function_input_iterator_expr(const Function &function)
         : m_function(function)
diff --git a/include/boost/compute/iterator/transform_iterator.hpp b/include/boost/compute/iterator/transform_iterator.hpp
index 65fb435e..03f44fdb 100644
--- a/include/boost/compute/iterator/transform_iterator.hpp
+++ b/include/boost/compute/iterator/transform_iterator.hpp
@@ -41,7 +41,7 @@ struct make_transform_iterator_value_type
 {
     typedef typename std::iterator_traits<InputIterator>::value_type value_type;
 
-    typedef typename boost::result_of<UnaryFunction(value_type)>::type type;
+    typedef typename boost::tr1_result_of<UnaryFunction(value_type)>::type type;
 };
 
 // helper class which defines the iterator_adaptor super-class
diff --git a/include/boost/compute/lambda/context.hpp b/include/boost/compute/lambda/context.hpp
index 0ba43c42..12dbe11a 100644
--- a/include/boost/compute/lambda/context.hpp
+++ b/include/boost/compute/lambda/context.hpp
@@ -214,7 +214,7 @@ namespace detail {
 template<class Expr, class Arg>
 struct invoked_unary_expression
 {
-    typedef typename ::boost::result_of<Expr(Arg)>::type result_type;
+    typedef typename ::boost::tr1_result_of<Expr(Arg)>::type result_type;
 
     invoked_unary_expression(const std::string &expr, const Arg &arg)
         : m_expr(expr),
@@ -256,7 +256,7 @@ operator<<(boost::compute::detail::meta_kernel &kernel,
 template<class Expr, class Arg1, class Arg2>
 struct invoked_binary_expression
 {
-    typedef typename ::boost::result_of<Expr(Arg1, Arg2)>::type result_type;
+    typedef typename ::boost::tr1_result_of<Expr(Arg1, Arg2)>::type result_type;
 
     invoked_binary_expression(const std::string &expr,
                               const Arg1 &arg1,
@@ -357,11 +357,13 @@ struct expression : proto::extends<Expr, expression<Expr>, domain>
     };
 
     ::boost::compute::detail::meta_kernel_variable<
-        typename ::boost::result_of<expression<Expr>()>::type
+        typename ::boost::tr1_result_of<expression<Expr>()>::type
     >
     operator()() const
     {
-        typedef typename ::boost::result_of<expression<Expr>()>::type result_type;
+        typedef typename
+            ::boost::tr1_result_of<expression<Expr>()>::type
+            result_type;
 
         context ctx;
         proto::eval(*this, ctx);