From d1c9b4b24ffd0422221f380b52d91e560deba9b3 Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Thu, 18 Feb 2021 09:28:09 +0100 Subject: [PATCH] no 'and' in C++ (but ok for gcc and clang ?) --- libsrc/meshing/topology.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libsrc/meshing/topology.cpp b/libsrc/meshing/topology.cpp index 701f09ba..7502091a 100644 --- a/libsrc/meshing/topology.cpp +++ b/libsrc/meshing/topology.cpp @@ -879,12 +879,13 @@ namespace netgen } - + /* for (int i : Range(parent_edges)) { auto [info, nrs] = parent_edges[i]; - // cout << "edge " << i << " has " << info << ", nrs = " << nrs[0] << " " << nrs[1] << endl; + cout << "edge " << i << " has " << info << ", nrs = " << nrs[0] << " " << nrs[1] << endl; } + */ } } @@ -1559,7 +1560,7 @@ namespace netgen if (k==2){// vb is the largest vert: 6 cases // by default v0 < v1, v2 < v3 if (v1 < v2) classnr = 0; - else if (v1 < v3 and v0 < v2) classnr = 1; + else if (v1 < v3 && v0 < v2) classnr = 1; else if (v0 < v2) classnr = 2; else if (v1 < v3) classnr = 3; else if (v0 < v3) classnr = 4;