From df407fdc564480ffdce601d25fa840c10889aad1 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 14 Nov 2013 20:51:29 +0000
Subject: [PATCH] and -> &&

---
 Geo/Geo.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index 4da710f00e..225853278d 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -3968,11 +3968,11 @@ void setSurfaceEmbeddedCurves(Surface *s, List_T *curves)
                 pq = pq2;
                 w = w2;
               }
-              if (pq < eps and pp < eps)
+              if (pq < eps && pp < eps)
                 mergePoint = true;
-              else if (pq >= eps and pp < eps)
+              else if (pq >= eps && pp < eps)
                 splitcToAddInSurf = true;
-              else if (pq < eps and pp >= eps)
+              else if (pq < eps && pp >= eps)
                 splitcDejaInSurf = true;
               else{
                 createPoint = true;
-- 
GitLab