Commit 7c810ba6 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Revert "Fix of array operations containsValue and containsOnlyValue to compile with g++-4.8." 

The original was simpler/more readable and we require GCC 5.0 now.

This reverts commit d920a278.
parent 0088abdc

src/TNL/Containers/Algorithms/ArrayOperationsCuda_impl.h

+4 −6
Original line number Diff line number Diff line
@@ -201,10 +201,9 @@ containsValue( const Element* data, 
   TNL_ASSERT_GE( size, 0, "" );

   if( size == 0 ) return false;

   bool result = false;

   using Operation = Algorithms::ParallelReductionContainsValue< Element >;

   Operation reductionContainsValue;

   Algorithms::ParallelReductionContainsValue< Element > reductionContainsValue;

   reductionContainsValue.setValue( value );

   Reduction< Devices::Cuda >::template reduce< Operation, Index >( reductionContainsValue, size, data, 0, result );

   Reduction< Devices::Cuda >::reduce( reductionContainsValue, size, data, 0, result );

   return result;

}
@@ -220,10 +219,9 @@ containsOnlyValue( const Element* data, 
   TNL_ASSERT_GE( size, 0, "" );

   if( size == 0 ) return false;

   bool result = false;

   using Operation = Algorithms::ParallelReductionContainsOnlyValue< Element >;

   Operation reductionContainsOnlyValue;

   Algorithms::ParallelReductionContainsOnlyValue< Element > reductionContainsOnlyValue;

   reductionContainsOnlyValue.setValue( value );

   Reduction< Devices::Cuda >::template reduce< Operation, Index >( reductionContainsOnlyValue, size, data, 0, result );

   Reduction< Devices::Cuda >::reduce( reductionContainsOnlyValue, size, data, 0, result );

   return result;

}