From 70a58c22eec54394046a6d9ae7df9e8d2e41fb89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Sat, 24 Apr 2021 12:45:51 +0200
Subject: [PATCH] Fixing types in asserts of array and arrays assignment.
---
src/TNL/Containers/ArrayView.hpp | 2 +-
src/TNL/Containers/detail/ArrayAssignment.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/TNL/Containers/ArrayView.hpp b/src/TNL/Containers/ArrayView.hpp
index cd0a4c537b..1562508a8b 100644
--- a/src/TNL/Containers/ArrayView.hpp
+++ b/src/TNL/Containers/ArrayView.hpp
@@ -49,7 +49,7 @@ void
ArrayView< Value, Device, Index >::
bind( ValueType* data, IndexType size )
{
- TNL_ASSERT_GE( size, 0, "ArrayView size was initialized with a negative size." );
+ TNL_ASSERT_GE( size, ( IndexType ) 0, "ArrayView size was initialized with a negative size." );
TNL_ASSERT_TRUE( (data == nullptr && size == 0) || (data != nullptr && size > 0),
"ArrayView was initialized with a positive address and zero size or zero address and positive size." );
diff --git a/src/TNL/Containers/detail/ArrayAssignment.h b/src/TNL/Containers/detail/ArrayAssignment.h
index c6ac6cb1c3..ee1487c769 100644
--- a/src/TNL/Containers/detail/ArrayAssignment.h
+++ b/src/TNL/Containers/detail/ArrayAssignment.h
@@ -38,7 +38,7 @@ struct ArrayAssignment< Array, T, true >
static void assign( Array& a, const T& t )
{
- TNL_ASSERT_EQ( a.getSize(), t.getSize(), "The sizes of the arrays must be equal." );
+ TNL_ASSERT_EQ( a.getSize(), ( decltype( a.getSize() ) ) t.getSize(), "The sizes of the arrays must be equal." );
// skip assignment of empty arrays
if( a.getSize() == 0 )
return;
--
GitLab