yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #11163
[Branch ~yade-pkg/yade/git-trunk] Rev 4129: fixed bug in MASK_ARBITRARY feature
------------------------------------------------------------
revno: 4129
committer: Jan Stransky <jan.stransky@xxxxxxxxxxx>
timestamp: Fri 2014-08-01 18:00:13 +0200
message:
fixed bug in MASK_ARBITRARY feature
modified:
lib/base/Math.cpp
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'lib/base/Math.cpp'
--- lib/base/Math.cpp 2014-06-17 10:18:00 +0000
+++ lib/base/Math.cpp 2014-08-01 16:00:13 +0000
@@ -20,8 +20,8 @@
mask_t operator&(int i, const mask_t& g) { return g & i; }
mask_t operator|(const mask_t& g, int i) { return g | mask_t(i); }
mask_t operator|(int i, const mask_t& g) { return g | i; }
-bool operator||(const mask_t& g, bool b) { return (g == 0) || b; }
+bool operator||(const mask_t& g, bool b) { return (g != 0) || b; }
bool operator||(bool b, const mask_t& g) { return g || b; }
-bool operator&&(const mask_t& g, bool b) { return (g == 0) && b; }
+bool operator&&(const mask_t& g, bool b) { return (g != 0) && b; }
bool operator&&(bool b, const mask_t& g) { return g && b; }
#endif