diff --git a/exprtk.hpp b/exprtk.hpp index e0eb192..6b092a4 100644 --- a/exprtk.hpp +++ b/exprtk.hpp @@ -1114,7 +1114,7 @@ namespace exprtk template inline T and_impl(const T v0, const T v1, int_type_tag) { - return v0 && v1; + return v0 & v1; } template @@ -1138,7 +1138,7 @@ namespace exprtk template inline T or_impl(const T v0, const T v1, int_type_tag) { - return (v0 || v1); + return (v0 | v1); } template