From 8bfb9abdb53669871445ebd15c7081159f0b70d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz>
Date: Tue, 7 Jan 2020 15:52:09 +0100
Subject: [PATCH] Fix in NeighborGridEntityGetter: abs method -> TNL::abs
function
---
src/TNL/Meshes/GridDetails/NeighborGridEntityGetter2D_impl.h | 2 +-
src/TNL/Meshes/GridDetails/NeighborGridEntityGetter3D_impl.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/TNL/Meshes/GridDetails/NeighborGridEntityGetter2D_impl.h b/src/TNL/Meshes/GridDetails/NeighborGridEntityGetter2D_impl.h
index d6f4ab24ed..1591a523e0 100644
--- a/src/TNL/Meshes/GridDetails/NeighborGridEntityGetter2D_impl.h
+++ b/src/TNL/Meshes/GridDetails/NeighborGridEntityGetter2D_impl.h
@@ -409,7 +409,7 @@ class NeighborGridEntityGetter<
std::cerr << "( stepX, stepY ) cannot be perpendicular to entity coordinates: stepX = " << stepX << " stepY = " << stepY
<< " entity.getOrientation() = " << entity.getOrientation() );*/
TNL_ASSERT_GE( entity.getCoordinates(), CoordinatesType( 0, 0 ), "wrong coordinates" );
- TNL_ASSERT_LT( entity.getCoordinates(), entity.getMesh().getDimensions() + entity.getOrientation().abs(), "wrong coordinates" );
+ TNL_ASSERT_LT( entity.getCoordinates(), entity.getMesh().getDimensions() + TNL::abs(entity.getOrientation()), "wrong coordinates" );
TNL_ASSERT( entity.getCoordinates() +
CoordinatesType( stepX - ( stepX > 0 ) * ( entity.getOrientation().x() != 0.0 ),
stepY - ( stepY > 0 ) * ( entity.getOrientation().y() != 0.0 ) ) >= CoordinatesType( 0, 0 ) &&
diff --git a/src/TNL/Meshes/GridDetails/NeighborGridEntityGetter3D_impl.h b/src/TNL/Meshes/GridDetails/NeighborGridEntityGetter3D_impl.h
index 3cf2bb8d13..7c260f5779 100644
--- a/src/TNL/Meshes/GridDetails/NeighborGridEntityGetter3D_impl.h
+++ b/src/TNL/Meshes/GridDetails/NeighborGridEntityGetter3D_impl.h
@@ -616,7 +616,7 @@ class NeighborGridEntityGetter<
<< " stepY = " << stepY << " stepZ = " << stepZ
<< " entity.getOrientation() = " << entity.getOrientation() );*/
TNL_ASSERT_GE( entity.getCoordinates(), CoordinatesType( 0, 0, 0 ), "wrong coordinates" );
- TNL_ASSERT_LT( entity.getCoordinates(), entity.getMesh().getDimensions() + entity.getOrientation().abs(), "wrong coordinates" );
+ TNL_ASSERT_LT( entity.getCoordinates(), entity.getMesh().getDimensions() + TNL::abs(entity.getOrientation()), "wrong coordinates" );
TNL_ASSERT( entity.getCoordinates() +
CoordinatesType( stepX - ( stepX > 0 ) * ( entity.getOrientation().x() != 0.0 ),
stepY - ( stepY > 0 ) * ( entity.getOrientation().y() != 0.0 ),
--
GitLab