From 7c810ba617cae116e6a929498b90330181562b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Sat, 15 Sep 2018 16:35:14 +0200
Subject: [PATCH] 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 d920a2789c940ac3f4b693b6ced1189c15681a06.
---
.../Containers/Algorithms/ArrayOperationsCuda_impl.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/TNL/Containers/Algorithms/ArrayOperationsCuda_impl.h b/src/TNL/Containers/Algorithms/ArrayOperationsCuda_impl.h
index 1f21dc261d..bca6bdb047 100644
--- a/src/TNL/Containers/Algorithms/ArrayOperationsCuda_impl.h
+++ b/src/TNL/Containers/Algorithms/ArrayOperationsCuda_impl.h
@@ -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;
}
--
GitLab