From b77af00c5d29d7a88d976530d3354052344151aa Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Mon, 31 Mar 2014 00:01:25 +0200
Subject: Removed some operator keywords.

(bzr r13237)
---
 src/live_effects/lpe-knot.cpp          | 2 +-
 src/live_effects/lpe-rough-hatches.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/live_effects')

diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index e91677e18..581c632f5 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -493,7 +493,7 @@ LPEKnot::doEffect_path (std::vector<Geom::Path> const &path_in)
             }
         }
         for (unsigned comp = beg_comp; comp < end_comp; comp++){
-            assert(dom.at(comp).min() >=0 and dom.at(comp).max() <= size_nondegenerate(gpaths.at(i0)));
+            assert(dom.at(comp).min() >=0 && dom.at(comp).max() <= size_nondegenerate(gpaths.at(i0)));
             path_out.push_back(gpaths[i0].portion(dom.at(comp)));
         }
     }
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 6ffb913bd..455653e46 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -319,7 +319,7 @@ LPERoughHatches::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &
         transformed_pwd2_in = transformed_pwd2_in * bend_mat;
         tilter = Piecewise<SBasis>(shift(Linear(-bend_amount),1));
         OptRect bbox = bounds_exact( transformed_pwd2_in );
-        if (not(bbox)) return pwd2_in;
+        if (!(bbox)) return pwd2_in;
         tilter.setDomain((*bbox)[Y]);
         transformed_pwd2_in = bend(transformed_pwd2_in, tilter);
         transformed_pwd2_in = transformed_pwd2_in * bend_mat.inverse();
@@ -381,7 +381,7 @@ LPERoughHatches::linearSnake(Piecewise<D2<SBasis> > const &f, Point const &org){
     Piecewise<SBasis> dx = derivative(x);
     OptInterval range = bounds_exact(x);
 
-    if (not range) return result;
+    if (!range) return result;
     std::vector<double> levels = generateLevels(*range, org[X]);
     std::vector<std::vector<double> > times;
     times = multi_roots(x,levels);
-- 
cgit v1.2.3