Resolve conflicts and errors due to rebasing.
MODIFY
thrust/detail/config/compiler.h
thrust/detail/config/compiler.h
#define THRUST_DEVICE_COMPILER_HIP 5
// figure out which host compiler we're using
-// XXX we should move the definition of THRUST_DEPRECATED out of this logic
+// TODO we should move the definition of THRUST_DEPRECATED out of this logic
#if defined(_MSC_VER)
#define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_MSVC
#define THRUST_DEPRECATED __declspec(deprecated)
THRUST_DISABLE_CLANG_SELF_ASSIGNMENT_WARNING_END \
/**/
-// TODO we should move the definition of THRUST_DEPRECATED out of this logic
-#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
- #define THRUST_DEPRECATED __declspec(deprecated)
-#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG
- #define THRUST_DEPRECATED __attribute__((deprecated))
-#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC
- #define THRUST_DEPRECATED __attribute__((deprecated))
-#else
- #define THRUST_DEPRECATED
-#endif
-
->>>>>>> 14f8a540... Thrust 10.1 asynchronous algorithms (core functionality).

MODIFY
thrust/system/detail/generic/for_each.h
thrust/system/detail/generic/for_each.h
@@ -44,14 +44,6 @@ __host__ __device__
InputIterator for_each(thrust::execution_policy<DerivedPolicy> &,
InputIterator first,
InputIterator,
-<<<<<<< HEAD
- UnaryFunction );
-// {
-// // unimplemented
-// THRUST_STATIC_ASSERT( (thrust::detail::depend_on_instantiation<InputIterator, false>::value) );
-// return first;
-// } // end for_each()
-=======
UnaryFunction)
{
THRUST_STATIC_ASSERT_MSG(
@@ -60,8 +52,6 @@ InputIterator for_each(thrust::execution_policy<DerivedPolicy> &,
);
return first;
} // end for_each()
->>>>>>> 14f8a540... Thrust 10.1 asynchronous algorithms (core functionality).
-
template<typename DerivedPolicy,
typename InputIterator,
@@ -71,14 +61,6 @@ __host__ __device__
InputIterator for_each_n(thrust::execution_policy<DerivedPolicy> &,
InputIterator first,
Size,
-<<<<<<< HEAD
- UnaryFunction );
-// {
-// // unimplemented
-// THRUST_STATIC_ASSERT( (thrust::detail::depend_on_instantiation<InputIterator, false>::value) );
-// return first;
-// } // end for_each_n()
-=======
UnaryFunction)
{
THRUST_STATIC_ASSERT_MSG(
@@ -87,8 +69,6 @@ InputIterator for_each_n(thrust::execution_policy<DerivedPolicy> &,
);
return first;
} // end for_each_n()
->>>>>>> 14f8a540... Thrust 10.1 asynchronous algorithms (core functionality).
-
} // end namespace generic
} // end namespace detail

Resolve conflicts and errors due to rebasing.