Thrust CMake conversion:

 * Fix namespace references for CUDA errors after slight re-namespacing.
 * Drop the use of GCC's broken nodiscard-like attribute.

Author: griwes

thrust/detail/config/cpp_compatibility.h

@@ -27,8 +27,6 @@
 
 #  if __has_cpp_attribute(nodiscard)
 #    define THRUST_NODISCARD [[nodiscard]]
-#  elif __has_cpp_attribute(gnu::warn_unused_result)
-#    define THRUST_NODISCARD [[gnu::warn_unused_result]]
 #  endif
 
 #  define THRUST_CONSTEXPR constexpr
@@ -37,7 +35,7 @@
 #  define THRUST_NOEXCEPT noexcept
 #  define THRUST_FINAL final
 #else
-#  define THRUST_CONSTEXPR 
+#  define THRUST_CONSTEXPR
 #  define THRUST_OVERRIDE
 #  define THRUST_DEFAULT {}
 #  define THRUST_NOEXCEPT throw()

thrust/system/cuda/detail/error.inl

@@ -27,13 +27,13 @@ namespace system
 {
 
 
-error_code make_error_code(cuda_cub::errc::errc_t e)
+error_code make_error_code(cuda::errc::errc_t e)
 {
   return error_code(static_cast<int>(e), cuda_category());
 } // end make_error_code()
 
 
-error_condition make_error_condition(cuda_cub::errc::errc_t e)
+error_condition make_error_condition(cuda::errc::errc_t e)
 {
   return error_condition(static_cast<int>(e), cuda_category());
 } // end make_error_condition()
@@ -69,7 +69,7 @@ class cuda_error_category
 
     inline virtual error_condition default_error_condition(int ev) const
     {
-      using namespace cuda_cub::errc;
+      using namespace cuda::errc;
 
       if(ev < ::cudaErrorApiFailureBase)
       {

thrust/system/cuda/error.h

@@ -148,19 +148,19 @@ inline const error_category &cuda_category(void);
 
 /*! Specialization of \p is_error_code_enum for \p cuda::errc::errc_t
  */
-template<> struct is_error_code_enum<cuda_cub::errc::errc_t> : thrust::detail::true_type {};
+template<> struct is_error_code_enum<cuda::errc::errc_t> : thrust::detail::true_type {};
 
 
 // XXX replace cuda::errc::errc_t with cuda::errc upon c++0x
 /*! \return <tt>error_code(static_cast<int>(e), cuda::error_category())</tt>
  */
-inline error_code make_error_code(cuda_cub::errc::errc_t e);
+inline error_code make_error_code(cuda::errc::errc_t e);
 
 
 // XXX replace cuda::errc::errc_t with cuda::errc upon c++0x
 /*! \return <tt>error_condition(static_cast<int>(e), cuda::error_category())</tt>.
  */
-inline error_condition make_error_condition(cuda_cub::errc::errc_t e);
+inline error_condition make_error_condition(cuda::errc::errc_t e);
 
 } // end system